diff --git a/pages/brandApartmentDetail/brandApartmentDetail.js b/pages/brandApartmentDetail/brandApartmentDetail.js
index b859e67..932ad8a 100644
--- a/pages/brandApartmentDetail/brandApartmentDetail.js
+++ b/pages/brandApartmentDetail/brandApartmentDetail.js
@@ -181,7 +181,7 @@ Page({
// if (that.data.data.isquarantine) title = this.data.listTab.quarantineLists + '-' + that.data.data.title
const data = this.data.data
-
+
let title = "";
if (data.sharetitle) title = '香港租房 | ' + data.sharetitle
else title = '香港租房 | ' + data.title
@@ -211,7 +211,6 @@ Page({
},
get_content: function () {
- console.log("get_content");
let that = this;
var sendData = Object.assign({}, this.data.options, {
session: wx.getStorageSync('session'),
@@ -221,7 +220,6 @@ Page({
// q: that.data.q
})
- console.log("sendData", sendData);
let url = `${app.globalData.baseURL}/tenement/v2/api/apartment/details`
// url = app.globalData.config.studentapartment.details
miucms.wxget(url, sendData).then(data => {
@@ -326,7 +324,6 @@ Page({
},
drawPoster() {
- const user = app.globalData.user
const data = this.data.data
const roomList = this.data.roomList || []
let title = `${ roomList.length > 1 ? '多房型' : '' }`
@@ -334,8 +331,7 @@ Page({
const price = Math.min(...roomList.map(item => item.price));
title += ` HK$${ price }起`
- const bj = data.attachment?.[0] || data.videos?.[0]?.thumbnail || data.attachment?.[0]
- return
+ const bj = data.image
miucms.generatePoster({
bj,
title,
@@ -344,7 +340,6 @@ Page({
this.setData({
shareImage: res
})
- console.log("shareImage", this.data.shareImage);
})
},
@@ -641,7 +636,6 @@ Page({
})
let attachment = [...targetData['videos'], ...targetData['images']]
- console.log("attachment", attachment);
// wx.previewMedia({
// sources: attachment,
// current
diff --git a/pages/brandApartmentDetail/brandApartmentDetail.less b/pages/brandApartmentDetail/brandApartmentDetail.less
index b65dc3c..328cb70 100644
--- a/pages/brandApartmentDetail/brandApartmentDetail.less
+++ b/pages/brandApartmentDetail/brandApartmentDetail.less
@@ -801,6 +801,7 @@ map .clickmap {
.tab-box .tab-item {
height: 48rpx;
+ line-height: 48rpx;
padding: 0 16rpx;
color: #447eb3;
background: linear-gradient(-55.8297720355872deg, rgba(224, 240, 255, 1) 0%, rgba(98, 177, 255, 1) 297%);
@@ -1264,4 +1265,14 @@ map .clickmap {
.bottom-bar .bottom-bar-share::after {
border: none;
height: 0;
+}
+
+.shareImage {
+ width: 280px;
+ height: 224px;
+}
+
+.aspectFill {
+ width: 280px;
+ height: 219px;
}
\ No newline at end of file
diff --git a/pages/brandApartmentDetail/brandApartmentDetail.wxml b/pages/brandApartmentDetail/brandApartmentDetail.wxml
index fadd4cb..2b4b551 100644
--- a/pages/brandApartmentDetail/brandApartmentDetail.wxml
+++ b/pages/brandApartmentDetail/brandApartmentDetail.wxml
@@ -1,10 +1,10 @@
- 公寓详情
+
-
+
@@ -172,11 +172,11 @@
-
+
房源距离学校
-
+
diff --git a/pages/brandApartmentDetail/brandApartmentDetail.wxss b/pages/brandApartmentDetail/brandApartmentDetail.wxss
index 35a3bcd..c1d0448 100644
--- a/pages/brandApartmentDetail/brandApartmentDetail.wxss
+++ b/pages/brandApartmentDetail/brandApartmentDetail.wxss
@@ -2007,6 +2007,7 @@ map .clickmap {
}
.tab-box .tab-item {
height: 48rpx;
+ line-height: 48rpx;
padding: 0 16rpx;
color: #447eb3;
background: linear-gradient(-55.82977204deg, #e0f0ff 0%, #62b1ff 297%);
@@ -2404,3 +2405,11 @@ map .clickmap {
border: none;
height: 0;
}
+.shareImage {
+ width: 280px;
+ height: 224px;
+}
+.aspectFill {
+ width: 280px;
+ height: 219px;
+}
diff --git a/pages/show/show.js b/pages/show/show.js
index 5cc3016..099e755 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -112,6 +112,7 @@ Page({
specialSchoolDistance: null, // 特殊的 用户带有school参数 则需要特殊显示 学校距离
isShowVideo: true, // 是否显示 视频
+ showTab: "",
},
to_share() {
wx.navigateTo({
@@ -236,8 +237,7 @@ Page({
// let title = `中国香港 > ${ info.locationList[0].head } > ${ info.locationList[0].end }`
// if (info.address) title += ' > ' + info.address
-
- let title = that.data.info.subject
+ let title = '香港租房 | ' + that.data.info.subject
let imageUrl = ""
if (info['intermediary'] == 6) title = "香港租房 | 共5000+实时香港房源，甄选优质学生公寓"
else imageUrl = that.data.info.share_img
@@ -314,7 +314,12 @@ Page({
updatetime = updatetime.replaceAll("-", "/") // 替换格式 部分 iOS 系统不支持
data.info['updatetimeText'] = miucms.getTimeAgo(updatetime)
+ let showTab = "person"
+ if (data.info.intermediary == 1) showTab = "agent"
+ if (data.info.intermediary == 6) showTab = "need"
+
that.setData({
+ showTab,
contactValue,
irentCouponBig: app.globalData.irentCouponBig || true,
info: data.info,
@@ -362,8 +367,11 @@ Page({
this.handleDetailData()
- if (data.info.intermediary != 6) this.drawPoster()
-
+ if (data.info.intermediary != 6) {
+ // setInterval(() => {
+ this.drawPoster()
+ // }, 1000);
+ }
// 判断是否需要获取附近房源
if (data.info.latitude && data.info.verified == 0 && data.info.intermediary != 6 && data.isintermediary != 1) this.getNearbListings()
else this.nearbListingsState = true // 阻止上拉底部加载的
@@ -383,43 +391,28 @@ Page({
},
drawPoster() {
- console.log("444");
let obj = {}
const info = this.data.info
- console.log("intermediary", info.intermediary);
const image = info.picturegroup || []
const isintermediary = this.data.isintermediary || 0 // 是否是认证中介
- console.log("isintermediary", isintermediary);
let title = `${ info.gptype }·${ info.type }·HK$${ info.rent }`
- obj['bj'] = image?.[0]?.thumbnail || ''
+ obj['bj'] = info.image || image?.[0]?.thumbnail || ''
obj['title'] = title
- // console.log("image", image);
- if (isintermediary == 1) { // 认证中介
- obj['type'] = 2
- } else if (info.intermediary == 1) { // 普通中介
- obj['type'] = 3
- } else if (info.intermediary == 3 && info.verified == 0) { // 普通个人房源
- obj['type'] = 4
- } else if (info.intermediary == 3 && info.verified == 1) { // 认证个人房源
- obj['type'] = 5
- } else if (info.intermediary == 4) { // 招室友
- obj['type'] = 6
- } else if (info.intermediary == 5) { // 其他
- obj['type'] = 7
- }
+ if (isintermediary == 1) obj['type'] = 2 // 认证中介
+ else if (info.intermediary == 1) obj['type'] = 3 // 普通中介
+ else if (info.intermediary == 3 && info.verified == 0) obj['type'] = 4 // 普通个人房源
+ else if (info.intermediary == 3 && info.verified == 1) obj['type'] = 5 // 认证个人房源
+ else if (info.intermediary == 4) obj['type'] = 6 // 招室友
+ else if (info.intermediary == 5) obj['type'] = 7 // 其他
-
- console.log("obj", obj);
let res = null
if (obj['bj']) res = miucms.generatePoster(obj)
else {
- console.log(5555);
obj['position'] = `香港 > ${ info.locationList[0].head } > ${ info.locationList[0].end }`
obj['typeText'] = `${ info.gptype } · ${ info.type }`
obj['price'] = info.rent
res = miucms.generatePosterNoImage(obj)
}
- console.log("res", res);
res.then(res => {
this.setData({
shareImage: res
@@ -442,11 +435,8 @@ Page({
// 专门梳理v4出现的 语音包 及 不同房源值的处理
handleDetailData() {
let langs = this.data.langs || {}
- if (Object.keys(langs).length == 0) {
- setTimeout(() => {
- this.handleDetailData()
- }, 300)
- } else {
+ if (Object.keys(langs).length == 0) setTimeout(() => this.handleDetailData(), 300)
+ else {
let info = this.data.info
// 判断是否是求房源的区间 面积 和 价格
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index 2b41b82..4bd9398 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -21,7 +21,9 @@
- 房源详情
+
+
+
diff --git a/template/headerNav/index.js b/template/headerNav/index.js
index 5c1f671..6fbadfc 100644
--- a/template/headerNav/index.js
+++ b/template/headerNav/index.js
@@ -22,6 +22,11 @@ Component({
headerSrc: String, // 首页的右上角图标
backSrc: String, // 特殊的返回图标
borderBottom: Boolean,
+
+ showTab: String, // 需要显示的 列表按钮
+ newHeadOperate: Boolean, // 是否是 新的 二级页面 顶部 返回按钮
+ operationsTop: Boolean, // 是否 滚动了 不需要顶部颜色
+
},
/**
@@ -36,6 +41,12 @@ Component({
},
isTabPage: false,
openDate: {}, // 开屏广告数据
+ showTabObj: {
+ person: "房源列表",
+ agent: "房源列表",
+ apartment: "公寓列表",
+ need: "求房源列表",
+ },
},
lifetimes: {
attached: function () {
@@ -122,6 +133,25 @@ Component({
// 跳转发布系统消息页面
goIsMessage() {
this.triggerEvent("goIsMessage")
- }
+ },
+ // 头部 跳转 中转
+ skipTransfer(e) {
+ const key = e.currentTarget.dataset.key
+ const pages = getCurrentPages();
+ if (key == 'back' && pages.length > 1) {
+ wx.navigateBack()
+ return
+ }
+
+ let url = ''
+ if (key == 'index' || key == 'back') url = '/pages/index/index'
+ if (key == 'person') url = '/pages/personList/personList'
+ if (key == 'agent') url = '/pages/agentList/agentList'
+ if (key == 'apartment') url = '/pages/brandApartmentList/brandApartmentList'
+ if (key == 'need') url = '/pages/needHousing/needHousing'
+ wx.navigateTo({
+ url,
+ })
+ },
}
})
\ No newline at end of file
diff --git a/template/headerNav/index.less b/template/headerNav/index.less
new file mode 100644
index 0000000..307a678
--- /dev/null
+++ b/template/headerNav/index.less
@@ -0,0 +1,212 @@
+/* template/headerNav/index.wxss */
+.NavBar {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ background: #fff;
+ z-index: 1000;
+ /* border-bottom: 1px solid #f2f2f2; */
+}
+
+.NavBar-statusBar {
+ width: 100%;
+}
+
+.NavBar-titlebar {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.capsule-holder {
+ width: 100px;
+ height: 100%;
+}
+
+.NavBar-SearchBar {
+ flex: 1;
+ padding: 0 16px;
+ overflow: hidden;
+}
+
+.NavBar-content {
+ display: flex;
+ flex: 1;
+ margin: 0;
+ overflow: hidden;
+}
+
+.NavBar-left {
+ width: 55px;
+ height: 32px;
+ border-radius: 32px;
+ /* border: solid 1px #f6f6f6; */
+ text-align: center;
+ display: flex;
+ align-items: center;
+}
+
+.NavBar-content-title {
+ font-size: 17px;
+ /* font-weight: 600; */
+ font-weight: bold;
+ flex: 1;
+ text-align: center;
+ line-height: 32px;
+ height: 32px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-left: 11px;
+
+ color: #000000;
+}
+
+.backToHome {
+ height: 32px;
+}
+
+.search-btn {
+ padding: 5px
+}
+
+.search-btn image {
+ /* height: 18px;
+ width: 18px; */
+ width: 45rpx;
+ height: 45rpx;
+}
+
+.NavBar-HomeIcon {
+ width: 20px;
+ height: 18px;
+}
+
+.NavBar-left-area {
+ width: 87px;
+}
+
+.NavBar-left-more {
+ width: 87px;
+ height: 32px;
+ display: flex;
+}
+
+.NavBar-left-more .backToHome {
+ /* flex: 1; */
+ width: 45rpx;
+ height: 45rpx;
+}
+
+.NavBar-BackIcon {
+ /* flex: 1; */
+ width: 12px;
+ height: 18px;
+ padding: 1px 0;
+ box-sizing: border-box;
+ /* border-right: solid 1px #d2d2d2; */
+}
+
+.Btn {
+ display: flex;
+ flex: 1;
+ max-width: 44px;
+ height: 32px;
+ padding: 1px 0;
+ text-align: left;
+ box-sizing: border-box;
+ justify-content: center;
+ align-items: center;
+}
+
+.Btn .user {
+ width: 20px;
+ height: 21px;
+ margin: 0;
+}
+
+.navigator-hover {
+ background-color: #fff;
+ opacity: 1
+}
+
+.hover {
+ background: #fff;
+ opacity: 1
+}
+
+.message-count {
+ margin-left: 20rpx;
+ width: 39rpx;
+ height: 30rpx;
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-image: url(data:image/svg+xml;base64,77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIxOXB4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxnIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgLTY1IC0yMTQgKSI+CiAgICA8cGF0aCBkPSJNIDIyLjY2MDcxNDI4NTcxNDMgNy4zMDA0MjYxMzYzNjM2NCAgQyAyMy4xNjk2NDI4NTcxNDI5IDYuOTQ5NTczODYzNjM2MzYgIDIzLjYxNjA3MTQyODU3MTQgNi41NTgyMzg2MzYzNjM2NCAgMjQgNi4xMjY0MjA0NTQ1NDU0NSAgTCAyNCAxNi44NDA5MDkwOTA5MDkxICBDIDI0IDE3LjQzNDY1OTA5MDkwOTEgIDIzLjc5MDE3ODU3MTQyODYgMTcuOTQyOTQ1MDc1NzU3NiAgMjMuMzcwNTM1NzE0Mjg1NyAxOC4zNjU3NjcwNDU0NTQ1ICBDIDIyLjk1MDg5Mjg1NzE0MjkgMTguNzg4NTg5MDE1MTUxNSAgMjIuNDQ2NDI4NTcxNDI4NiAxOSAgMjEuODU3MTQyODU3MTQyOSAxOSAgTCAyLjE0Mjg1NzE0Mjg1NzE0IDE5ICBDIDEuNTUzNTcxNDI4NTcxNDMgMTkgIDEuMDQ5MTA3MTQyODU3MTQgMTguNzg4NTg5MDE1MTUxNSAgMC42Mjk0NjQyODU3MTQyODYgMTguMzY1NzY3MDQ1NDU0NSAgQyAwLjIwOTgyMTQyODU3MTQyOSAxNy45NDI5NDUwNzU3NTc2ICAwIDE3LjQzNDY1OTA5MDkwOTEgIDAgMTYuODQwOTA5MDkwOTA5MSAgTCAwIDYuMTI2NDIwNDU0NTQ1NDUgIEMgMC4zOTI4NTcxNDI4NTcxNDMgNi41NjcyMzQ4NDg0ODQ4NSAgMC44NDM3NSA2Ljk1ODU3MDA3NTc1NzU3ICAxLjM1MjY3ODU3MTQyODU3IDcuMzAwNDI2MTM2MzYzNjQgIEMgNC41ODQ4MjE0Mjg1NzE0MyA5LjUxMzQ5NDMxODE4MTgyICA2LjgwMzU3MTQyODU3MTQzIDExLjA2NTM0MDkwOTA5MDkgIDguMDA4OTI4NTcxNDI4NTcgMTEuOTU1OTY1OTA5MDkwOSAgQyA4LjUxNzg1NzE0Mjg1NzE0IDEyLjMzMzgwNjgxODE4MTggIDguOTMwODAzNTcxNDI4NTcgMTIuNjI4NDMyNzY1MTUxNSAgOS4yNDc3Njc4NTcxNDI4NiAxMi44Mzk4NDM3NSAgQyA5LjU2NDczMjE0Mjg1NzE0IDEzLjA1MTI1NDczNDg0ODUgIDkuOTg2NjA3MTQyODU3MTQgMTMuMjY3MTYzODI1NzU3NiAgMTAuNTEzMzkyODU3MTQyOSAxMy40ODc1NzEwMjI3MjczICBDIDExLjA0MDE3ODU3MTQyODYgMTMuNzA3OTc4MjE5Njk3ICAxMS41MzEyNSAxMy44MTgxODE4MTgxODE4ICAxMS45ODY2MDcxNDI4NTcxIDEzLjgxODE4MTgxODE4MTggIEwgMTIgMTMuODE4MTgxODE4MTgxOCAgTCAxMi4wMTMzOTI4NTcxNDI5IDEzLjgxODE4MTgxODE4MTggIEMgMTIuNDY4NzUgMTMuODE4MTgxODE4MTgxOCAgMTIuOTU5ODIxNDI4NTcxNCAxMy43MDc5NzgyMTk2OTcgIDEzLjQ4NjYwNzE0Mjg1NzEgMTMuNDg3NTcxMDIyNzI3MyAgQyAxNC4wMTMzOTI4NTcxNDI5IDEzLjI2NzE2MzgyNTc1NzYgIDE0LjQzNTI2Nzg1NzE0MjkgMTMuMDUxMjU0NzM0ODQ4NSAgMTQuNzUyMjMyMTQyODU3MSAxMi44Mzk4NDM3NSAgQyAxNS4wNjkxOTY0Mjg1NzE0IDEyLjYyODQzMjc2NTE1MTUgIDE1LjQ4MjE0Mjg1NzE0MjkgMTIuMzMzODA2ODE4MTgxOCAgMTUuOTkxMDcxNDI4NTcxNCAxMS45NTU5NjU5MDkwOTA5ICBDIDE3LjUwODkyODU3MTQyODYgMTAuODQ5NDMxODE4MTgxOCAgMTkuNzMyMTQyODU3MTQyOSA5LjI5NzU4NTIyNzI3MjczICAyMi42NjA3MTQyODU3MTQzIDcuMzAwNDI2MTM2MzYzNjQgIFogTSAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBDIDIzLjc4Nzk0NjQyODU3MTQgMS4wNTcwNTQ5MjQyNDI0MiAgMjQgMS41NjUzNDA5MDkwOTA5MSAgMjQgMi4xNTkwOTA5MDkwOTA5MSAgQyAyNCAyLjg2OTc5MTY2NjY2NjY2ICAyMy43ODEyNSAzLjU0OTAwNTY4MTgxODE4ICAyMy4zNDM3NSA0LjE5NjczMjk1NDU0NTQ1ICBDIDIyLjkwNjI1IDQuODQ0NDYwMjI3MjcyNzMgIDIyLjM2MTYwNzE0Mjg1NzEgNS4zOTc3MjcyNzI3MjcyNyAgMjEuNzA5ODIxNDI4NTcxNCA1Ljg1NjUzNDA5MDkwOTA5ICBDIDE4LjM1MjY3ODU3MTQyODYgOC4yMDQ1NDU0NTQ1NDU0NSAgMTYuMjYzMzkyODU3MTQyOSA5LjY2NjQyOTkyNDI0MjQzICAxNS40NDE5NjQyODU3MTQzIDEwLjI0MjE4NzUgIEMgMTUuMzUyNjc4NTcxNDI4NiAxMC4zMDUxNjA5ODQ4NDg1ICAxNS4xNjI5NDY0Mjg1NzE0IDEwLjQ0MjM1MzIxOTY5NyAgMTQuODcyNzY3ODU3MTQyOSAxMC42NTM3NjQyMDQ1NDU1ICBDIDE0LjU4MjU4OTI4NTcxNDMgMTAuODY1MTc1MTg5MzkzOSAgMTQuMzQxNTE3ODU3MTQyOSAxMS4wMzYxMDMyMTk2OTcgIDE0LjE0OTU1MzU3MTQyODYgMTEuMTY2NTQ4Mjk1NDU0NSAgQyAxMy45NTc1ODkyODU3MTQzIDExLjI5Njk5MzM3MTIxMjEgIDEzLjcyNTQ0NjQyODU3MTQgMTEuNDQzMTgxODE4MTgxOCAgMTMuNDUzMTI1IDExLjYwNTExMzYzNjM2MzYgIEMgMTMuMTgwODAzNTcxNDI4NiAxMS43NjcwNDU0NTQ1NDU1ICAxMi45MjQxMDcxNDI4NTcxIDExLjg4ODQ5NDMxODE4MTggIDEyLjY4MzAzNTcxNDI4NTcgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMi40NDE5NjQyODU3MTQzIDEyLjA1MDQyNjEzNjM2MzYgIDEyLjIxODc1IDEyLjA5MDkwOTA5MDkwOTEgIDEyLjAxMzM5Mjg1NzE0MjkgMTIuMDkwOTA5MDkwOTA5MSAgTCAxMiAxMi4wOTA5MDkwOTA5MDkxICBMIDExLjk4NjYwNzE0Mjg1NzEgMTIuMDkwOTA5MDkwOTA5MSAgQyAxMS43ODEyNSAxMi4wOTA5MDkwOTA5MDkxICAxMS41NTgwMzU3MTQyODU3IDEyLjA1MDQyNjEzNjM2MzYgIDExLjMxNjk2NDI4NTcxNDMgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMS4wNzU4OTI4NTcxNDI5IDExLjg4ODQ5NDMxODE4MTggIDEwLjgxOTE5NjQyODU3MTQgMTEuNzY3MDQ1NDU0NTQ1NSAgMTAuNTQ2ODc1IDExLjYwNTExMzYzNjM2MzYgIEMgMTAuMjc0NTUzNTcxNDI4NiAxMS40NDMxODE4MTgxODE4ICAxMC4wNDI0MTA3MTQyODU3IDExLjI5Njk5MzM3MTIxMjEgIDkuODUwNDQ2NDI4NTcxNDMgMTEuMTY2NTQ4Mjk1NDU0NSAgQyA5LjY1ODQ4MjE0Mjg1NzE0IDExLjAzNjEwMzIxOTY5NyAgOS40MTc0MTA3MTQyODU3MiAxMC44NjUxNzUxODkzOTM5ICA5LjEyNzIzMjE0Mjg1NzE0IDEwLjY1Mzc2NDIwNDU0NTUgIEMgOC44MzcwNTM1NzE0Mjg1NyAxMC40NDIzNTMyMTk2OTcgIDguNjQ3MzIxNDI4NTcxNDMgMTAuMzA1MTYwOTg0ODQ4NSAgOC41NTgwMzU3MTQyODU3MiAxMC4yNDIxODc1ICBDIDcuNzQ1NTM1NzE0Mjg1NzEgOS42NjY0Mjk5MjQyNDI0MyAgNi41NzU4OTI4NTcxNDI4NiA4Ljg0NTUyNTU2ODE4MTgyICA1LjA0OTEwNzE0Mjg1NzE0IDcuNzc5NDc0NDMxODE4MTggIEMgMy41MjIzMjE0Mjg1NzE0MyA2LjcxMzQyMzI5NTQ1NDU0ICAyLjYwNzE0Mjg1NzE0Mjg2IDYuMDcyNDQzMTgxODE4MTggIDIuMzAzNTcxNDI4NTcxNDMgNS44NTY1MzQwOTA5MDkwOSAgQyAxLjc1IDUuNDc4NjkzMTgxODE4MTggIDEuMjI3Njc4NTcxNDI4NTcgNC45NTkxNjE5MzE4MTgxOCAgMC43MzY2MDcxNDI4NTcxNDMgNC4yOTc5NDAzNDA5MDkwOSAgQyAwLjI0NTUzNTcxNDI4NTcxNCAzLjYzNjcxODc1ICAwIDMuMDIyNzI3MjcyNzI3MjcgIDAgMi40NTU5NjU5MDkwOTA5MSAgQyAwIDEuNzU0MjYxMzYzNjM2MzYgIDAuMTg1MjY3ODU3MTQyODU3IDEuMTY5NTA3NTc1NzU3NTcgIDAuNTU1ODAzNTcxNDI4NTcyIDAuNzAxNzA0NTQ1NDU0NTQ2ICBDIDAuOTI2MzM5Mjg1NzE0Mjg2IDAuMjMzOTAxNTE1MTUxNTEzICAxLjQ1NTM1NzE0Mjg1NzE0IDAgIDIuMTQyODU3MTQyODU3MTQgMCAgTCAyMS44NTcxNDI4NTcxNDI5IDAgIEMgMjIuNDM3NSAwICAyMi45Mzk3MzIxNDI4NTcxIDAuMjExNDEwOTg0ODQ4NDgyICAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBaICIgZmlsbC1ydWxlPSJub256ZXJvIiBmaWxsPSIjMDAwMDAwIiBzdHJva2U9Im5vbmUiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgNjUgMjE0ICkiIC8+CiAgPC9nPgo8L3N2Zz4=);
+}
+
+.isMessage image {
+ margin-left: 20rpx;
+ width: 42rpx;
+ height: 28rpx;
+}
+
+.message {
+ position: relative;
+}
+
+.red-dot {
+ position: absolute;
+ top: -13rpx;
+ right: -13rpx;
+ width: 26rpx;
+ height: 26rpx;
+ background-color: #c54235;
+ color: #fff;
+ border-radius: 50rpx;
+ font-size: 23rpx;
+ box-shadow: 0.629px 0.777px 16px 0px rgba(243, 243, 243, 0.996);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.top-image {
+ width: 255rpx;
+ height: 42rpx;
+ margin-left: 30rpx;
+}
+
+.left-operate-box {
+ height: 57rpx;
+ background-color: rgba(239, 246, 254, 1);
+ // border: 1rpx solid rgba(239, 246, 254, 1);
+ border-radius: 66rpx;
+ margin-left: 15rpx;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ transition: all .3s;
+
+}
+
+.left-operate-box .left-operate-item {
+ font-size: 24rpx;
+ line-height: 37.5rpx;
+ color: #333;
+ display: flex;
+ align-items: center;
+ padding: 0 19rpx;
+ box-sizing: border-box;
+}
+
+.left-operate-box .left-operate-item:not(:last-of-type) {
+ border-right: 1rpx solid #d7d7d7;
+}
+
+.left-operate-box .left-operate-item .left-operate-icon {
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 9rpx;
+}
\ No newline at end of file
diff --git a/template/headerNav/index.wxml b/template/headerNav/index.wxml
index 04681b5..64bf4f2 100644
--- a/template/headerNav/index.wxml
+++ b/template/headerNav/index.wxml
@@ -1,54 +1,69 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+ 首页
+
+
+
+ {{ showTabObj[showTab]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ unreadMessages }}
-
-
+
+
+
+ {{ unreadMessages }}
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/template/headerNav/index.wxss b/template/headerNav/index.wxss
index c725be9..954df2c 100644
--- a/template/headerNav/index.wxss
+++ b/template/headerNav/index.wxss
@@ -1,179 +1,181 @@
-/* template/headerNav/index.wxss */
-.NavBar {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- background: #fff;
- z-index: 1000;
- /* border-bottom: 1px solid #f2f2f2; */
-}
-
-.NavBar-statusBar {
- width: 100%;
-}
-
-.NavBar-titlebar {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.capsule-holder {
- width: 100px;
- height: 100%;
-}
-
-.NavBar-SearchBar {
- flex: 1;
- padding: 0 16px;
- overflow: hidden;
-}
-
-.NavBar-content {
- display: flex;
- flex: 1;
- margin: 0;
- overflow: hidden;
-}
-
-.NavBar-left {
- width: 55px;
- height: 32px;
- border-radius: 32px;
- /* border: solid 1px #f6f6f6; */
- text-align: center;
- display: flex;
- align-items: center;
-}
-
-.NavBar-content-title {
- font-size: 17px;
- /* font-weight: 600; */
- font-weight: bold;
- flex: 1;
- text-align: center;
- line-height: 32px;
- height: 32px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- padding-left: 11px;
-
- color: #000000;
-}
-
-.backToHome {
- height: 32px;
-}
-
-.search-btn {
- padding: 5px
-}
-
-.search-btn image {
- /* height: 18px;
- width: 18px; */
- width: 45rpx;
- height: 45rpx;
-}
-
-.NavBar-HomeIcon {
- width: 20px;
- height: 18px;
-}
-
-.NavBar-left-area {
- width: 87px;
-}
-
-.NavBar-left-more {
- width: 87px;
- height: 32px;
- display: flex;
-}
-
-.NavBar-left-more .backToHome {
- /* flex: 1; */
- width: 45rpx;
- height: 45rpx;
-}
-
-.NavBar-BackIcon {
- /* flex: 1; */
- width: 12px;
- height: 18px;
- padding: 1px 0;
- box-sizing: border-box;
- /* border-right: solid 1px #d2d2d2; */
-}
-
-.Btn {
- display: flex;
- flex: 1;
- max-width: 44px;
- height: 32px;
- padding: 1px 0;
- text-align: left;
- box-sizing: border-box;
- justify-content: center;
- align-items: center;
-}
-
-.Btn .user {
- width: 20px;
- height: 21px;
- margin: 0;
-}
-
-.navigator-hover {
- background-color: #fff;
- opacity: 1
-}
-
-.hover {
- background: #fff;
- opacity: 1
-}
-
-.message-count {
- margin-left: 20rpx;
- width: 39rpx;
- height: 30rpx;
- background-size: contain;
- background-repeat: no-repeat;
- background-image: url(data:image/svg+xml;base64,77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIxOXB4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxnIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgLTY1IC0yMTQgKSI+CiAgICA8cGF0aCBkPSJNIDIyLjY2MDcxNDI4NTcxNDMgNy4zMDA0MjYxMzYzNjM2NCAgQyAyMy4xNjk2NDI4NTcxNDI5IDYuOTQ5NTczODYzNjM2MzYgIDIzLjYxNjA3MTQyODU3MTQgNi41NTgyMzg2MzYzNjM2NCAgMjQgNi4xMjY0MjA0NTQ1NDU0NSAgTCAyNCAxNi44NDA5MDkwOTA5MDkxICBDIDI0IDE3LjQzNDY1OTA5MDkwOTEgIDIzLjc5MDE3ODU3MTQyODYgMTcuOTQyOTQ1MDc1NzU3NiAgMjMuMzcwNTM1NzE0Mjg1NyAxOC4zNjU3NjcwNDU0NTQ1ICBDIDIyLjk1MDg5Mjg1NzE0MjkgMTguNzg4NTg5MDE1MTUxNSAgMjIuNDQ2NDI4NTcxNDI4NiAxOSAgMjEuODU3MTQyODU3MTQyOSAxOSAgTCAyLjE0Mjg1NzE0Mjg1NzE0IDE5ICBDIDEuNTUzNTcxNDI4NTcxNDMgMTkgIDEuMDQ5MTA3MTQyODU3MTQgMTguNzg4NTg5MDE1MTUxNSAgMC42Mjk0NjQyODU3MTQyODYgMTguMzY1NzY3MDQ1NDU0NSAgQyAwLjIwOTgyMTQyODU3MTQyOSAxNy45NDI5NDUwNzU3NTc2ICAwIDE3LjQzNDY1OTA5MDkwOTEgIDAgMTYuODQwOTA5MDkwOTA5MSAgTCAwIDYuMTI2NDIwNDU0NTQ1NDUgIEMgMC4zOTI4NTcxNDI4NTcxNDMgNi41NjcyMzQ4NDg0ODQ4NSAgMC44NDM3NSA2Ljk1ODU3MDA3NTc1NzU3ICAxLjM1MjY3ODU3MTQyODU3IDcuMzAwNDI2MTM2MzYzNjQgIEMgNC41ODQ4MjE0Mjg1NzE0MyA5LjUxMzQ5NDMxODE4MTgyICA2LjgwMzU3MTQyODU3MTQzIDExLjA2NTM0MDkwOTA5MDkgIDguMDA4OTI4NTcxNDI4NTcgMTEuOTU1OTY1OTA5MDkwOSAgQyA4LjUxNzg1NzE0Mjg1NzE0IDEyLjMzMzgwNjgxODE4MTggIDguOTMwODAzNTcxNDI4NTcgMTIuNjI4NDMyNzY1MTUxNSAgOS4yNDc3Njc4NTcxNDI4NiAxMi44Mzk4NDM3NSAgQyA5LjU2NDczMjE0Mjg1NzE0IDEzLjA1MTI1NDczNDg0ODUgIDkuOTg2NjA3MTQyODU3MTQgMTMuMjY3MTYzODI1NzU3NiAgMTAuNTEzMzkyODU3MTQyOSAxMy40ODc1NzEwMjI3MjczICBDIDExLjA0MDE3ODU3MTQyODYgMTMuNzA3OTc4MjE5Njk3ICAxMS41MzEyNSAxMy44MTgxODE4MTgxODE4ICAxMS45ODY2MDcxNDI4NTcxIDEzLjgxODE4MTgxODE4MTggIEwgMTIgMTMuODE4MTgxODE4MTgxOCAgTCAxMi4wMTMzOTI4NTcxNDI5IDEzLjgxODE4MTgxODE4MTggIEMgMTIuNDY4NzUgMTMuODE4MTgxODE4MTgxOCAgMTIuOTU5ODIxNDI4NTcxNCAxMy43MDc5NzgyMTk2OTcgIDEzLjQ4NjYwNzE0Mjg1NzEgMTMuNDg3NTcxMDIyNzI3MyAgQyAxNC4wMTMzOTI4NTcxNDI5IDEzLjI2NzE2MzgyNTc1NzYgIDE0LjQzNTI2Nzg1NzE0MjkgMTMuMDUxMjU0NzM0ODQ4NSAgMTQuNzUyMjMyMTQyODU3MSAxMi44Mzk4NDM3NSAgQyAxNS4wNjkxOTY0Mjg1NzE0IDEyLjYyODQzMjc2NTE1MTUgIDE1LjQ4MjE0Mjg1NzE0MjkgMTIuMzMzODA2ODE4MTgxOCAgMTUuOTkxMDcxNDI4NTcxNCAxMS45NTU5NjU5MDkwOTA5ICBDIDE3LjUwODkyODU3MTQyODYgMTAuODQ5NDMxODE4MTgxOCAgMTkuNzMyMTQyODU3MTQyOSA5LjI5NzU4NTIyNzI3MjczICAyMi42NjA3MTQyODU3MTQzIDcuMzAwNDI2MTM2MzYzNjQgIFogTSAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBDIDIzLjc4Nzk0NjQyODU3MTQgMS4wNTcwNTQ5MjQyNDI0MiAgMjQgMS41NjUzNDA5MDkwOTA5MSAgMjQgMi4xNTkwOTA5MDkwOTA5MSAgQyAyNCAyLjg2OTc5MTY2NjY2NjY2ICAyMy43ODEyNSAzLjU0OTAwNTY4MTgxODE4ICAyMy4zNDM3NSA0LjE5NjczMjk1NDU0NTQ1ICBDIDIyLjkwNjI1IDQuODQ0NDYwMjI3MjcyNzMgIDIyLjM2MTYwNzE0Mjg1NzEgNS4zOTc3MjcyNzI3MjcyNyAgMjEuNzA5ODIxNDI4NTcxNCA1Ljg1NjUzNDA5MDkwOTA5ICBDIDE4LjM1MjY3ODU3MTQyODYgOC4yMDQ1NDU0NTQ1NDU0NSAgMTYuMjYzMzkyODU3MTQyOSA5LjY2NjQyOTkyNDI0MjQzICAxNS40NDE5NjQyODU3MTQzIDEwLjI0MjE4NzUgIEMgMTUuMzUyNjc4NTcxNDI4NiAxMC4zMDUxNjA5ODQ4NDg1ICAxNS4xNjI5NDY0Mjg1NzE0IDEwLjQ0MjM1MzIxOTY5NyAgMTQuODcyNzY3ODU3MTQyOSAxMC42NTM3NjQyMDQ1NDU1ICBDIDE0LjU4MjU4OTI4NTcxNDMgMTAuODY1MTc1MTg5MzkzOSAgMTQuMzQxNTE3ODU3MTQyOSAxMS4wMzYxMDMyMTk2OTcgIDE0LjE0OTU1MzU3MTQyODYgMTEuMTY2NTQ4Mjk1NDU0NSAgQyAxMy45NTc1ODkyODU3MTQzIDExLjI5Njk5MzM3MTIxMjEgIDEzLjcyNTQ0NjQyODU3MTQgMTEuNDQzMTgxODE4MTgxOCAgMTMuNDUzMTI1IDExLjYwNTExMzYzNjM2MzYgIEMgMTMuMTgwODAzNTcxNDI4NiAxMS43NjcwNDU0NTQ1NDU1ICAxMi45MjQxMDcxNDI4NTcxIDExLjg4ODQ5NDMxODE4MTggIDEyLjY4MzAzNTcxNDI4NTcgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMi40NDE5NjQyODU3MTQzIDEyLjA1MDQyNjEzNjM2MzYgIDEyLjIxODc1IDEyLjA5MDkwOTA5MDkwOTEgIDEyLjAxMzM5Mjg1NzE0MjkgMTIuMDkwOTA5MDkwOTA5MSAgTCAxMiAxMi4wOTA5MDkwOTA5MDkxICBMIDExLjk4NjYwNzE0Mjg1NzEgMTIuMDkwOTA5MDkwOTA5MSAgQyAxMS43ODEyNSAxMi4wOTA5MDkwOTA5MDkxICAxMS41NTgwMzU3MTQyODU3IDEyLjA1MDQyNjEzNjM2MzYgIDExLjMxNjk2NDI4NTcxNDMgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMS4wNzU4OTI4NTcxNDI5IDExLjg4ODQ5NDMxODE4MTggIDEwLjgxOTE5NjQyODU3MTQgMTEuNzY3MDQ1NDU0NTQ1NSAgMTAuNTQ2ODc1IDExLjYwNTExMzYzNjM2MzYgIEMgMTAuMjc0NTUzNTcxNDI4NiAxMS40NDMxODE4MTgxODE4ICAxMC4wNDI0MTA3MTQyODU3IDExLjI5Njk5MzM3MTIxMjEgIDkuODUwNDQ2NDI4NTcxNDMgMTEuMTY2NTQ4Mjk1NDU0NSAgQyA5LjY1ODQ4MjE0Mjg1NzE0IDExLjAzNjEwMzIxOTY5NyAgOS40MTc0MTA3MTQyODU3MiAxMC44NjUxNzUxODkzOTM5ICA5LjEyNzIzMjE0Mjg1NzE0IDEwLjY1Mzc2NDIwNDU0NTUgIEMgOC44MzcwNTM1NzE0Mjg1NyAxMC40NDIzNTMyMTk2OTcgIDguNjQ3MzIxNDI4NTcxNDMgMTAuMzA1MTYwOTg0ODQ4NSAgOC41NTgwMzU3MTQyODU3MiAxMC4yNDIxODc1ICBDIDcuNzQ1NTM1NzE0Mjg1NzEgOS42NjY0Mjk5MjQyNDI0MyAgNi41NzU4OTI4NTcxNDI4NiA4Ljg0NTUyNTU2ODE4MTgyICA1LjA0OTEwNzE0Mjg1NzE0IDcuNzc5NDc0NDMxODE4MTggIEMgMy41MjIzMjE0Mjg1NzE0MyA2LjcxMzQyMzI5NTQ1NDU0ICAyLjYwNzE0Mjg1NzE0Mjg2IDYuMDcyNDQzMTgxODE4MTggIDIuMzAzNTcxNDI4NTcxNDMgNS44NTY1MzQwOTA5MDkwOSAgQyAxLjc1IDUuNDc4NjkzMTgxODE4MTggIDEuMjI3Njc4NTcxNDI4NTcgNC45NTkxNjE5MzE4MTgxOCAgMC43MzY2MDcxNDI4NTcxNDMgNC4yOTc5NDAzNDA5MDkwOSAgQyAwLjI0NTUzNTcxNDI4NTcxNCAzLjYzNjcxODc1ICAwIDMuMDIyNzI3MjcyNzI3MjcgIDAgMi40NTU5NjU5MDkwOTA5MSAgQyAwIDEuNzU0MjYxMzYzNjM2MzYgIDAuMTg1MjY3ODU3MTQyODU3IDEuMTY5NTA3NTc1NzU3NTcgIDAuNTU1ODAzNTcxNDI4NTcyIDAuNzAxNzA0NTQ1NDU0NTQ2ICBDIDAuOTI2MzM5Mjg1NzE0Mjg2IDAuMjMzOTAxNTE1MTUxNTEzICAxLjQ1NTM1NzE0Mjg1NzE0IDAgIDIuMTQyODU3MTQyODU3MTQgMCAgTCAyMS44NTcxNDI4NTcxNDI5IDAgIEMgMjIuNDM3NSAwICAyMi45Mzk3MzIxNDI4NTcxIDAuMjExNDEwOTg0ODQ4NDgyICAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBaICIgZmlsbC1ydWxlPSJub256ZXJvIiBmaWxsPSIjMDAwMDAwIiBzdHJva2U9Im5vbmUiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgNjUgMjE0ICkiIC8+CiAgPC9nPgo8L3N2Zz4=);
-}
-
-.isMessage image {
- margin-left: 20rpx;
- width: 42rpx;
- height: 28rpx;
-}
-
-.message {
- position: relative;
-}
-
-.red-dot {
- position: absolute;
- top: -13rpx;
- right: -13rpx;
- width: 26rpx;
- height: 26rpx;
- background-color: #c54235;
- color: #fff;
- border-radius: 50rpx;
- font-size: 23rpx;
- box-shadow: 0.629px 0.777px 16px 0px rgba(243, 243, 243, 0.996);
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.top-image{
- width: 255rpx;
- height: 42rpx;
- margin-left: 30rpx;
-}
\ No newline at end of file
+/* template/headerNav/index.wxss */
+.NavBar {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ background: #fff;
+ z-index: 1000;
+ /* border-bottom: 1px solid #f2f2f2; */
+}
+.NavBar-statusBar {
+ width: 100%;
+}
+.NavBar-titlebar {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.capsule-holder {
+ width: 100px;
+ height: 100%;
+}
+.NavBar-SearchBar {
+ flex: 1;
+ padding: 0 16px;
+ overflow: hidden;
+}
+.NavBar-content {
+ display: flex;
+ flex: 1;
+ margin: 0;
+ overflow: hidden;
+}
+.NavBar-left {
+ width: 55px;
+ height: 32px;
+ border-radius: 32px;
+ /* border: solid 1px #f6f6f6; */
+ text-align: center;
+ display: flex;
+ align-items: center;
+}
+.NavBar-content-title {
+ font-size: 17px;
+ /* font-weight: 600; */
+ font-weight: bold;
+ flex: 1;
+ text-align: center;
+ line-height: 32px;
+ height: 32px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-left: 11px;
+ color: #000000;
+}
+.backToHome {
+ height: 32px;
+}
+.search-btn {
+ padding: 5px;
+}
+.search-btn image {
+ /* height: 18px;
+ width: 18px; */
+ width: 45rpx;
+ height: 45rpx;
+}
+.NavBar-HomeIcon {
+ width: 20px;
+ height: 18px;
+}
+.NavBar-left-area {
+ width: 87px;
+}
+.NavBar-left-more {
+ width: 87px;
+ height: 32px;
+ display: flex;
+}
+.NavBar-left-more .backToHome {
+ /* flex: 1; */
+ width: 45rpx;
+ height: 45rpx;
+}
+.NavBar-BackIcon {
+ /* flex: 1; */
+ width: 12px;
+ height: 18px;
+ padding: 1px 0;
+ box-sizing: border-box;
+ /* border-right: solid 1px #d2d2d2; */
+}
+.Btn {
+ display: flex;
+ flex: 1;
+ max-width: 44px;
+ height: 32px;
+ padding: 1px 0;
+ text-align: left;
+ box-sizing: border-box;
+ justify-content: center;
+ align-items: center;
+}
+.Btn .user {
+ width: 20px;
+ height: 21px;
+ margin: 0;
+}
+.navigator-hover {
+ background-color: #fff;
+ opacity: 1;
+}
+.hover {
+ background: #fff;
+ opacity: 1;
+}
+.message-count {
+ margin-left: 20rpx;
+ width: 39rpx;
+ height: 30rpx;
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-image: url(data:image/svg+xml;base64,77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIxOXB4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxnIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgLTY1IC0yMTQgKSI+CiAgICA8cGF0aCBkPSJNIDIyLjY2MDcxNDI4NTcxNDMgNy4zMDA0MjYxMzYzNjM2NCAgQyAyMy4xNjk2NDI4NTcxNDI5IDYuOTQ5NTczODYzNjM2MzYgIDIzLjYxNjA3MTQyODU3MTQgNi41NTgyMzg2MzYzNjM2NCAgMjQgNi4xMjY0MjA0NTQ1NDU0NSAgTCAyNCAxNi44NDA5MDkwOTA5MDkxICBDIDI0IDE3LjQzNDY1OTA5MDkwOTEgIDIzLjc5MDE3ODU3MTQyODYgMTcuOTQyOTQ1MDc1NzU3NiAgMjMuMzcwNTM1NzE0Mjg1NyAxOC4zNjU3NjcwNDU0NTQ1ICBDIDIyLjk1MDg5Mjg1NzE0MjkgMTguNzg4NTg5MDE1MTUxNSAgMjIuNDQ2NDI4NTcxNDI4NiAxOSAgMjEuODU3MTQyODU3MTQyOSAxOSAgTCAyLjE0Mjg1NzE0Mjg1NzE0IDE5ICBDIDEuNTUzNTcxNDI4NTcxNDMgMTkgIDEuMDQ5MTA3MTQyODU3MTQgMTguNzg4NTg5MDE1MTUxNSAgMC42Mjk0NjQyODU3MTQyODYgMTguMzY1NzY3MDQ1NDU0NSAgQyAwLjIwOTgyMTQyODU3MTQyOSAxNy45NDI5NDUwNzU3NTc2ICAwIDE3LjQzNDY1OTA5MDkwOTEgIDAgMTYuODQwOTA5MDkwOTA5MSAgTCAwIDYuMTI2NDIwNDU0NTQ1NDUgIEMgMC4zOTI4NTcxNDI4NTcxNDMgNi41NjcyMzQ4NDg0ODQ4NSAgMC44NDM3NSA2Ljk1ODU3MDA3NTc1NzU3ICAxLjM1MjY3ODU3MTQyODU3IDcuMzAwNDI2MTM2MzYzNjQgIEMgNC41ODQ4MjE0Mjg1NzE0MyA5LjUxMzQ5NDMxODE4MTgyICA2LjgwMzU3MTQyODU3MTQzIDExLjA2NTM0MDkwOTA5MDkgIDguMDA4OTI4NTcxNDI4NTcgMTEuOTU1OTY1OTA5MDkwOSAgQyA4LjUxNzg1NzE0Mjg1NzE0IDEyLjMzMzgwNjgxODE4MTggIDguOTMwODAzNTcxNDI4NTcgMTIuNjI4NDMyNzY1MTUxNSAgOS4yNDc3Njc4NTcxNDI4NiAxMi44Mzk4NDM3NSAgQyA5LjU2NDczMjE0Mjg1NzE0IDEzLjA1MTI1NDczNDg0ODUgIDkuOTg2NjA3MTQyODU3MTQgMTMuMjY3MTYzODI1NzU3NiAgMTAuNTEzMzkyODU3MTQyOSAxMy40ODc1NzEwMjI3MjczICBDIDExLjA0MDE3ODU3MTQyODYgMTMuNzA3OTc4MjE5Njk3ICAxMS41MzEyNSAxMy44MTgxODE4MTgxODE4ICAxMS45ODY2MDcxNDI4NTcxIDEzLjgxODE4MTgxODE4MTggIEwgMTIgMTMuODE4MTgxODE4MTgxOCAgTCAxMi4wMTMzOTI4NTcxNDI5IDEzLjgxODE4MTgxODE4MTggIEMgMTIuNDY4NzUgMTMuODE4MTgxODE4MTgxOCAgMTIuOTU5ODIxNDI4NTcxNCAxMy43MDc5NzgyMTk2OTcgIDEzLjQ4NjYwNzE0Mjg1NzEgMTMuNDg3NTcxMDIyNzI3MyAgQyAxNC4wMTMzOTI4NTcxNDI5IDEzLjI2NzE2MzgyNTc1NzYgIDE0LjQzNTI2Nzg1NzE0MjkgMTMuMDUxMjU0NzM0ODQ4NSAgMTQuNzUyMjMyMTQyODU3MSAxMi44Mzk4NDM3NSAgQyAxNS4wNjkxOTY0Mjg1NzE0IDEyLjYyODQzMjc2NTE1MTUgIDE1LjQ4MjE0Mjg1NzE0MjkgMTIuMzMzODA2ODE4MTgxOCAgMTUuOTkxMDcxNDI4NTcxNCAxMS45NTU5NjU5MDkwOTA5ICBDIDE3LjUwODkyODU3MTQyODYgMTAuODQ5NDMxODE4MTgxOCAgMTkuNzMyMTQyODU3MTQyOSA5LjI5NzU4NTIyNzI3MjczICAyMi42NjA3MTQyODU3MTQzIDcuMzAwNDI2MTM2MzYzNjQgIFogTSAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBDIDIzLjc4Nzk0NjQyODU3MTQgMS4wNTcwNTQ5MjQyNDI0MiAgMjQgMS41NjUzNDA5MDkwOTA5MSAgMjQgMi4xNTkwOTA5MDkwOTA5MSAgQyAyNCAyLjg2OTc5MTY2NjY2NjY2ICAyMy43ODEyNSAzLjU0OTAwNTY4MTgxODE4ICAyMy4zNDM3NSA0LjE5NjczMjk1NDU0NTQ1ICBDIDIyLjkwNjI1IDQuODQ0NDYwMjI3MjcyNzMgIDIyLjM2MTYwNzE0Mjg1NzEgNS4zOTc3MjcyNzI3MjcyNyAgMjEuNzA5ODIxNDI4NTcxNCA1Ljg1NjUzNDA5MDkwOTA5ICBDIDE4LjM1MjY3ODU3MTQyODYgOC4yMDQ1NDU0NTQ1NDU0NSAgMTYuMjYzMzkyODU3MTQyOSA5LjY2NjQyOTkyNDI0MjQzICAxNS40NDE5NjQyODU3MTQzIDEwLjI0MjE4NzUgIEMgMTUuMzUyNjc4NTcxNDI4NiAxMC4zMDUxNjA5ODQ4NDg1ICAxNS4xNjI5NDY0Mjg1NzE0IDEwLjQ0MjM1MzIxOTY5NyAgMTQuODcyNzY3ODU3MTQyOSAxMC42NTM3NjQyMDQ1NDU1ICBDIDE0LjU4MjU4OTI4NTcxNDMgMTAuODY1MTc1MTg5MzkzOSAgMTQuMzQxNTE3ODU3MTQyOSAxMS4wMzYxMDMyMTk2OTcgIDE0LjE0OTU1MzU3MTQyODYgMTEuMTY2NTQ4Mjk1NDU0NSAgQyAxMy45NTc1ODkyODU3MTQzIDExLjI5Njk5MzM3MTIxMjEgIDEzLjcyNTQ0NjQyODU3MTQgMTEuNDQzMTgxODE4MTgxOCAgMTMuNDUzMTI1IDExLjYwNTExMzYzNjM2MzYgIEMgMTMuMTgwODAzNTcxNDI4NiAxMS43NjcwNDU0NTQ1NDU1ICAxMi45MjQxMDcxNDI4NTcxIDExLjg4ODQ5NDMxODE4MTggIDEyLjY4MzAzNTcxNDI4NTcgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMi40NDE5NjQyODU3MTQzIDEyLjA1MDQyNjEzNjM2MzYgIDEyLjIxODc1IDEyLjA5MDkwOTA5MDkwOTEgIDEyLjAxMzM5Mjg1NzE0MjkgMTIuMDkwOTA5MDkwOTA5MSAgTCAxMiAxMi4wOTA5MDkwOTA5MDkxICBMIDExLjk4NjYwNzE0Mjg1NzEgMTIuMDkwOTA5MDkwOTA5MSAgQyAxMS43ODEyNSAxMi4wOTA5MDkwOTA5MDkxICAxMS41NTgwMzU3MTQyODU3IDEyLjA1MDQyNjEzNjM2MzYgIDExLjMxNjk2NDI4NTcxNDMgMTEuOTY5NDYwMjI3MjcyNyAgQyAxMS4wNzU4OTI4NTcxNDI5IDExLjg4ODQ5NDMxODE4MTggIDEwLjgxOTE5NjQyODU3MTQgMTEuNzY3MDQ1NDU0NTQ1NSAgMTAuNTQ2ODc1IDExLjYwNTExMzYzNjM2MzYgIEMgMTAuMjc0NTUzNTcxNDI4NiAxMS40NDMxODE4MTgxODE4ICAxMC4wNDI0MTA3MTQyODU3IDExLjI5Njk5MzM3MTIxMjEgIDkuODUwNDQ2NDI4NTcxNDMgMTEuMTY2NTQ4Mjk1NDU0NSAgQyA5LjY1ODQ4MjE0Mjg1NzE0IDExLjAzNjEwMzIxOTY5NyAgOS40MTc0MTA3MTQyODU3MiAxMC44NjUxNzUxODkzOTM5ICA5LjEyNzIzMjE0Mjg1NzE0IDEwLjY1Mzc2NDIwNDU0NTUgIEMgOC44MzcwNTM1NzE0Mjg1NyAxMC40NDIzNTMyMTk2OTcgIDguNjQ3MzIxNDI4NTcxNDMgMTAuMzA1MTYwOTg0ODQ4NSAgOC41NTgwMzU3MTQyODU3MiAxMC4yNDIxODc1ICBDIDcuNzQ1NTM1NzE0Mjg1NzEgOS42NjY0Mjk5MjQyNDI0MyAgNi41NzU4OTI4NTcxNDI4NiA4Ljg0NTUyNTU2ODE4MTgyICA1LjA0OTEwNzE0Mjg1NzE0IDcuNzc5NDc0NDMxODE4MTggIEMgMy41MjIzMjE0Mjg1NzE0MyA2LjcxMzQyMzI5NTQ1NDU0ICAyLjYwNzE0Mjg1NzE0Mjg2IDYuMDcyNDQzMTgxODE4MTggIDIuMzAzNTcxNDI4NTcxNDMgNS44NTY1MzQwOTA5MDkwOSAgQyAxLjc1IDUuNDc4NjkzMTgxODE4MTggIDEuMjI3Njc4NTcxNDI4NTcgNC45NTkxNjE5MzE4MTgxOCAgMC43MzY2MDcxNDI4NTcxNDMgNC4yOTc5NDAzNDA5MDkwOSAgQyAwLjI0NTUzNTcxNDI4NTcxNCAzLjYzNjcxODc1ICAwIDMuMDIyNzI3MjcyNzI3MjcgIDAgMi40NTU5NjU5MDkwOTA5MSAgQyAwIDEuNzU0MjYxMzYzNjM2MzYgIDAuMTg1MjY3ODU3MTQyODU3IDEuMTY5NTA3NTc1NzU3NTcgIDAuNTU1ODAzNTcxNDI4NTcyIDAuNzAxNzA0NTQ1NDU0NTQ2ICBDIDAuOTI2MzM5Mjg1NzE0Mjg2IDAuMjMzOTAxNTE1MTUxNTEzICAxLjQ1NTM1NzE0Mjg1NzE0IDAgIDIuMTQyODU3MTQyODU3MTQgMCAgTCAyMS44NTcxNDI4NTcxNDI5IDAgIEMgMjIuNDM3NSAwICAyMi45Mzk3MzIxNDI4NTcxIDAuMjExNDEwOTg0ODQ4NDgyICAyMy4zNjM4MzkyODU3MTQzIDAuNjM0MjMyOTU0NTQ1NDU0ICBaICIgZmlsbC1ydWxlPSJub256ZXJvIiBmaWxsPSIjMDAwMDAwIiBzdHJva2U9Im5vbmUiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIDEgNjUgMjE0ICkiIC8+CiAgPC9nPgo8L3N2Zz4=);
+}
+.isMessage image {
+ margin-left: 20rpx;
+ width: 42rpx;
+ height: 28rpx;
+}
+.message {
+ position: relative;
+}
+.red-dot {
+ position: absolute;
+ top: -13rpx;
+ right: -13rpx;
+ width: 26rpx;
+ height: 26rpx;
+ background-color: #c54235;
+ color: #fff;
+ border-radius: 50rpx;
+ font-size: 23rpx;
+ box-shadow: 0.629px 0.777px 16px 0px rgba(243, 243, 243, 0.996);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.top-image {
+ width: 255rpx;
+ height: 42rpx;
+ margin-left: 30rpx;
+}
+.left-operate-box {
+ height: 57rpx;
+ background-color: #eff6fe;
+ border-radius: 66rpx;
+ margin-left: 15rpx;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ transition: all 0.3s;
+}
+.left-operate-box .left-operate-item {
+ font-size: 24rpx;
+ line-height: 37.5rpx;
+ color: #333;
+ display: flex;
+ align-items: center;
+ padding: 0 19rpx;
+ box-sizing: border-box;
+}
+.left-operate-box .left-operate-item:not(:last-of-type) {
+ border-right: 1rpx solid #d7d7d7;
+}
+.left-operate-box .left-operate-item .left-operate-icon {
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 9rpx;
+}
diff --git a/template/nearbySchool/nearbySchool.js b/template/nearbySchool/nearbySchool.js
index 60c5b16..5366db2 100644
--- a/template/nearbySchool/nearbySchool.js
+++ b/template/nearbySchool/nearbySchool.js
@@ -16,9 +16,7 @@ Component({
},
options: {
type: Object,
- observer(res) {
- console.log("res,options", res);
- }
+ observer(res) {}
},
istype: Number,
},
diff --git a/utils/miucms.js b/utils/miucms.js
index 1624083..7e8c04c 100644
--- a/utils/miucms.js
+++ b/utils/miucms.js
@@ -5,8 +5,8 @@ function initial(self) {
const fs = wx.getFileSystemManager();
console.log("getCurrentDate", getCurrentDate());
fs.mkdir({
- // dirPath: `${wx.env.USER_DATA_PATH}/${getCurrentDate()}`,
- dirPath: `${wx.env.USER_DATA_PATH}/2025-04-13`,
+ dirPath: `${wx.env.USER_DATA_PATH}/${getCurrentDate()}`,
+ // dirPath: `${wx.env.USER_DATA_PATH}/2025-04-13`,
success(res) {
console.log("res", res);
},
@@ -706,7 +706,6 @@ function backOrIndex() {
// 生成海报 type 1: 公寓 2：认证中介 3: 普通中介 4：个人房东 5：认证个人房源 6：招室友 7：其他
function generatePoster(target) {
- return
return new Promise(async (resolve, reject) => {
const user = getApp().globalData.user || {};
// 修改画布创建方式
@@ -715,6 +714,7 @@ function generatePoster(target) {
width: 280 * 2, // 增加分辨率
height: 224 * 2, // 增加分辨率
});
+ // target.bj = "https://oss.x-php.com/Zvt57TuJSUvkyhw-xG7Y2l-c-p4scXnqqsgFptxhT66QUmybYLYnAVBJQe2HpJNYt7VMACPX-Rzv5EQpu30SjsUfxT00NDI5";
const ctx = canvas.getContext("2d");
ctx.scale(2, 2); // 缩放绘图上下文
const tempFilePath = await downloadPic(target.bj);
@@ -770,7 +770,7 @@ function generatePoster(target) {
// 源图片裁剪：取中间宽度区域
srcWidth = bgImg.height * containerRatio;
- srcX = (bgImg.width - srcWidth) / 2;
+ srcX = (bgImg.width - drawHeight) / 2;
} else {
// 图片更高时，按容器宽度缩放
drawWidth = 280;
@@ -779,13 +779,17 @@ function generatePoster(target) {
// 源图片裁剪：取中间高度区域
srcHeight = bgImg.width / containerRatio;
- srcY = (bgImg.height - srcHeight) / 2;
+ srcY = (bgImg.height - drawWidth) / 2;
}
+ console.log("srcWidth", srcWidth, "srcHeight", srcHeight, "bgImg.width", bgImg.width, "drawWidth", drawWidth, "drawHeight", drawHeight, "srcX", srcX, "srcY", srcY);
+
// 修改后的drawImage调用
ctx.drawImage(
bgImg,
- srcX,
+ // srcX,
+ // 源图像裁剪区域
+ imageRatio > containerRatio ? (bgImg.width - srcWidth) / 2 : srcX, // 修正水平居中计算
srcY,
srcWidth, // 改为计算后的裁剪宽度
srcHeight, // 改为计算后的裁剪高度
@@ -897,7 +901,7 @@ function generatePoster(target) {
ctx.closePath();
ctx.fill();
- console.log("用户名好了");
+ console.log("用户名好了", user.avatar);
// 绘制头像
let avatarImg = canvas.createImage();
await new Promise((resolve) => {
@@ -935,28 +939,30 @@ function generatePoster(target) {
ctx.arcTo(0, 224, 0, 190, 15);
ctx.closePath();
ctx.fill();
- console.log("绘制位置图标");
+ console.log("绘制位置图标11");
// 绘制位置图标
let positionIcon = canvas.createImage();
await new Promise((resolve) => {
positionIcon.onload = resolve;
- positionIcon.src = `https://app.gter.net/image/miniApp/HKRenting/position-icon.svg?${Date.now()}`;
+ positionIcon.src = `https://app.gter.net/image/miniApp/HKRenting/position-icon.png?${Date.now()}`;
});
ctx.drawImage(positionIcon, 9, 200, 10, 14);
+ console.log("绘制位置图标完成");
// 绘制位置文本
ctx.fillStyle = "#fff";
ctx.font = "15px microsoft yahei";
ctx.fillText(`香港 | ${target.title}`, 25, 212);
+ console.log("开始绘制箭头图标");
// 绘制箭头图标
let arrowIcon = canvas.createImage();
await new Promise((resolve) => {
arrowIcon.onload = resolve;
- arrowIcon.src = `https://app.gter.net/image/miniApp/HKRenting/arrow-round-yellow.svg?${Date.now()}`;
+ arrowIcon.src = `https://app.gter.net/image/miniApp/HKRenting/arrow-round-yellow.png?${Date.now()}`;
});
ctx.drawImage(arrowIcon, 255, 200, 16, 16);
- console.log("绘制箭头图标");
+ console.log("绘制箭头图标完成");
// 修改最后保存图片的尺寸
const imgData = canvas.toDataURL({
@@ -967,27 +973,69 @@ function generatePoster(target) {
});
const filePath = `${wx.env.USER_DATA_PATH}/${getCurrentDate()}/poster_share_${Date.now()}.png`;
- console.log("filePath", filePath);
const fs = wx.getFileSystemManager();
console.log("开始保存");
+ let writeFileSum = 0; // 写入次数
+ const writeFile = () => {
+ writeFileSum++;
+ console.log("writeFileSum:", writeFileSum);
+ if (writeFileSum > 10) return;
+ fs.writeFile({
+ filePath,
+ data: imgData.replace(/^data:image\/\w+;base64,/, ""),
+ encoding: "base64",
+ success: (res) => {
+ console.log("生成成功", res);
+ fs.close();
+ resolve(filePath);
+ },
+ fail: (err) => {
+ console.log("err", err);
+ // 此处可能存在内存满了的情况
+ if (err?.errMsg?.indexOf("file storage limit is exceeded") != -1) {
+ fs.readdir({
+ dirPath: `${wx.env.USER_DATA_PATH}/${getCurrentDate()}`,
+ success: (res) => {
+ // 过滤并排序文件
+ const files = res.files
+ .filter((f) => f.startsWith("poster_share_") && f.endsWith(".png"))
+ .map((f) => ({
+ name: f,
+ timestamp: parseInt(f.match(/poster_share_(\d+)\.png/)[1]), // 提取时间戳
+ }))
+ .sort((a, b) => a.timestamp - b.timestamp); // 按时间戳升序排列
- fs.writeFile({
- filePath,
- data: imgData.replace(/^data:image\/\w+;base64,/, ""),
- encoding: "base64",
- success: (res) => {
- console.log("生成成功",res);
- resolve(filePath);
- },
- fail: (err) => {
- // 此处可能存在内存满了的情况
- // 需要根据具体需求处理
- console.log(err);
- },
- });
+ // 计算需要删除的数量（取前50%）
+ const deleteCount = Math.ceil(files.length / 2);
+ const toDelete = files.slice(0, deleteCount);
+
+ // 批量删除旧文件
+ toDelete.forEach((file) => {
+ fs.unlink({
+ filePath: `${wx.env.USER_DATA_PATH}/${getCurrentDate()}/${file.name}`,
+ success: () => console.log("已清理文件:", file.name),
+ fail: (e) => console.log("文件清理失败:", file.name, e),
+ });
+ });
+
+ // 重试写入
+ setTimeout(() => writeFile(), 1000);
+ },
+ });
+ }
+
+ if (err?.errMsg?.indexOf("fail no such file or directory") != -1) {
+ fs.mkdir({
+ dirPath: `${wx.env.USER_DATA_PATH}/${getCurrentDate()}`,
+ complete: (res) => writeFile(),
+ });
+ }
+ },
+ });
+ };
+
+ writeFile();
cleanupOldDateFolders();
-
- fs.close();
});
}
@@ -1098,7 +1146,6 @@ function generatePosterNoImage(target) {
});
const filePath = `${wx.env.USER_DATA_PATH}/${getCurrentDate()}/poster_share_${Date.now()}.png`;
- console.log("filePath", filePath);
wx.getFileSystemManager().writeFile({
filePath,
data: imgData.split(",")[1],
@@ -1114,7 +1161,7 @@ function generatePosterNoImage(target) {
// 下载图片
function downloadPic(src) {
return new Promise(async (resolve, reject) => {
- console.log(src);
+ console.log("开始下载海报");
wx.getImageInfo({
src,
success(res) {
@@ -1131,7 +1178,6 @@ function downloadPic(src) {
function cleanupOldDateFolders() {
const fs = wx.getFileSystemManager();
const currentDate = getCurrentDate();
-
fs.readdir({
dirPath: wx.env.USER_DATA_PATH,
success(res) {