From d731287ae9e903174738263d7c1b88540cf42c4d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 1 Apr 2024 19:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 5 +- pages/resiAndHouse/resiAndHouse.js | 2 +- pages/resiAndHouse/resiAndHouse.wxml | 3 +- subpages/OCRCard/pages/index/index.js | 2 +- subpages/searchResult/pages/cheshi/cheshi.js | 90 -- .../searchResult/pages/cheshi/cheshi.json | 4 - .../searchResult/pages/cheshi/cheshi.wxml | 157 --- .../searchResult/pages/cheshi/cheshi.wxss | 791 --------------- .../searchResult/pages/punchCard/punchCard.js | 916 ------------------ .../pages/punchCard/punchCard.json | 6 - .../pages/punchCard/punchCard.wxml | 121 --- .../pages/punchCard/punchCard.wxss | 241 ----- .../pages/searchResult/searchResult.js | 2 +- 13 files changed, 6 insertions(+), 2334 deletions(-) delete mode 100644 subpages/searchResult/pages/cheshi/cheshi.js delete mode 100644 subpages/searchResult/pages/cheshi/cheshi.json delete mode 100644 subpages/searchResult/pages/cheshi/cheshi.wxml delete mode 100644 subpages/searchResult/pages/cheshi/cheshi.wxss delete mode 100644 subpages/searchResult/pages/punchCard/punchCard.js delete mode 100644 subpages/searchResult/pages/punchCard/punchCard.json delete mode 100644 subpages/searchResult/pages/punchCard/punchCard.wxml delete mode 100644 subpages/searchResult/pages/punchCard/punchCard.wxss diff --git a/app.json b/app.json index eaa6659..bda8c20 100644 --- a/app.json +++ b/app.json @@ -30,9 +30,8 @@ "pages": [ "pages/searchResult/searchResult", "pages/searchRecords/searchRecords", - "pages/punchCard/punchCard", - "pages/checkLog/checkLog", - "pages/cheshi/cheshi" + "pages/resiInfo/resiInfo", + "pages/checkLog/checkLog" ] }, { diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index c78374b..9123dcc 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -193,7 +193,7 @@ Page({ // '1765976717767618562' console.log(e); wx.navigateTo({ - url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${e.currentTarget.dataset.resiid}`, + url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.resiid}`, }) }, onFinish(e) { diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index 2bf1849..e57b16a 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -22,9 +22,8 @@ 搜索 - - 。 + diff --git a/subpages/OCRCard/pages/index/index.js b/subpages/OCRCard/pages/index/index.js index 5a420a5..449166b 100644 --- a/subpages/OCRCard/pages/index/index.js +++ b/subpages/OCRCard/pages/index/index.js @@ -94,7 +94,7 @@ Page({ await this.getTable('card') if(this.data.tableData.length != 0){ wx.navigateTo({ - url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${this.data.tableData[0].resiId}`, + url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${this.data.tableData[0].resiId}`, }) }else{ wx.showToast({ diff --git a/subpages/searchResult/pages/cheshi/cheshi.js b/subpages/searchResult/pages/cheshi/cheshi.js deleted file mode 100644 index 7b67e57..0000000 --- a/subpages/searchResult/pages/cheshi/cheshi.js +++ /dev/null @@ -1,90 +0,0 @@ -// subpages/searchResult/pages/cheshi/cheshi.js -import {userXiangQ} from "../../../../utils/api" -Page({ - - /** - * 页面的初始数据 - */ - data: { - value: '', - jiChu:{}, - edit: false, - nationality:'', - document:'', - documentNum:'', - phon:'', - weare:'', - age:'', - bristy:'', - merea:'' - }, - - loadData: function (id) { - userXiangQ(id).then((res)=>{ - console.log(11111, res); - this.setData({ - 'jiChu': res.data, - 'documentNum':res.data.baseInfoDto.idNum, - 'phon':res.data.baseInfoDto.mobile, - 'age':res.data.baseInfoDto.genderName, - 'bristy': res.data.baseInfoDto.birthday, - 'merea':res.data.baseInfoDto.nationName - }); - console.log(11111, this.data.jiChu); - }).catch(err=>{ - console.log(222222, err); - }); -}, -// 生命周期函数--监听页面加载 -onLoad: function (options) { - const id = "1752963649818288129"; - this.loadData(id); // 调用自定义函数 -}, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/subpages/searchResult/pages/cheshi/cheshi.json b/subpages/searchResult/pages/cheshi/cheshi.json deleted file mode 100644 index a6d026e..0000000 --- a/subpages/searchResult/pages/cheshi/cheshi.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "基础信息" -} \ No newline at end of file diff --git a/subpages/searchResult/pages/cheshi/cheshi.wxml b/subpages/searchResult/pages/cheshi/cheshi.wxml deleted file mode 100644 index d394017..0000000 --- a/subpages/searchResult/pages/cheshi/cheshi.wxml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - {{jiChu.baseInfoDto.name}} - - 信息完整度： - 40% - - - 编辑 - - - - - 群众{{kong}} - - - {{kong}} - - - - 地址： - {{jiChu.baseInfoDto.resideInfos[0].homeName}} - - - 创建时间： - {{jiChu.baseInfoDto.createdTime}} - - - 最新更新时间： - {{jiChu.baseInfoDto.updatedTime}} - - - - - 基础信息（10/10) - - 拓展信息 （ - 3/4 ) - - 关系图谱 - - - - - 残疾信息 （ - 0/3 ） - - - 大病信息 （3) - - 变更记录（2） - - - - 业务记录（1） - - -
-
- - - - - - - 基础信息 - - - - - * - - 国籍 - - - 中国{{kong}} - - - - * - - 证件类型 - - - 身份证{{kong}} - - - - - * - - 证件号 - - - {{documentNum}} - - - - - * - - 联系电话 - - - {{phon}} - - - - - - 文化程度 - - - {{kong}} - - - - - - 性别 - - - {{age}} - - - - - 出生日期 - - - {{bristy}} - - - - - 民族 - - - {{merea}} - - - - - - - - - -
- 上报诉求 - 满意度调查 - 走访打卡 - -
diff --git a/subpages/searchResult/pages/cheshi/cheshi.wxss b/subpages/searchResult/pages/cheshi/cheshi.wxss deleted file mode 100644 index 29a0346..0000000 --- a/subpages/searchResult/pages/cheshi/cheshi.wxss +++ /dev/null @@ -1,791 +0,0 @@ -/* subpages/searchResult/pages/punchCard/punchCard.wxss */ -/**index.wxss**/ -page { - width: 100%; - min-height: 100vh; - overflow: hidden; - overflow-y: scroll; - background-color: #f7f7f7; - padding: 0 20rpx; - box-sizing: border-box; -} -.card{ - background-color: #fff; - border-radius: 20rpx; - display: flex; - flex-direction: column; - min-height: 350rpx; - margin-top: 20rpx; - padding: 30rpx 30rpx 40rpx; -} -.title{ - margin-left: 10px; -} -.card .title{ - position: relative; - font-size: 34rpx; - z-index: 1; -} -/* .card .title::after{ - position: absolute; - left: -30rpx; - top: 8rpx; - content: " "; - width: 10rpx; - height: 28rpx; - /* background-color: #3A80E7; */ -/* } */ -.card { -position: relative; -padding-left: 10px; /* 为了给阴影留出空间 */ - -} - - -.info{ - margin-top: 6rpx; -} -.info .item{ - display: flex; - margin-top: 28rpx; -} -.info .item .label{ - width: fit-content; -} -.punch{ - width: 260rpx; - height: 260rpx; - background: linear-gradient(180deg,#5E9FFF, #3A80E7); - box-shadow: 0rpx 4rpx 35rpx 0rpx rgba(61,139,248,0.48); - color: #fff; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - border-radius: 50%; - margin: 50rpx auto 0; -} - -.address{ - color: #666666; - font-size: 28rpx ; - margin: 0 auto; - margin: 40rpx auto 30rpx; -} - -@keyframes rotateAnimation { - 0% { - transform: rotateY(0deg); - } - 100% { - transform: rotateY(180deg); - } -} - -.animate { - animation: rotateAnimation 2s forwards; -} -.btn{ - padding: 0 85rpx; - box-sizing: border-box; - min-width: 364rpx; - text-align: center; - height: 76rpx; - border-radius: 38rpx; - margin: 30rpx auto 0; - line-height: 76rpx; - border-radius: 76rpx; -} - -.blue{ - color:#3A80E7 ; - border: 2rpx solid #3A80E7; - -} -.yellow{ - color: #FF783C; - border: 2rpx solid #FF783C; -} -.green{ - color: #13C8BD; - border: 2rpx solid #13C8BD; -} - -.flex-sb { - display: flex; - justify-content: space-between; - border-left: 5px solid blue; -} -.view { - color: #999; - font-size: 24rpx; -} -.jm-btn { - position: absolute; - top: 30rpx; - right: 20rpx; - width: 146rpx; - height: 56rpx; - line-height: 56rpx; - background: #3A80E7; - border-radius: 28rpx; - color: #fff; - text-align: center; - font-size: 28rpx; -} -.card { - position: relative; -} - - - -/* subpages/searchResult/pages/cheshi/cheshi.wxss */ -.text_2 { -width: 66rpx; -height: 32rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 34rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 41rpx; -margin-top: 4rpx; -} - -.text-wrapper_1 { -width: 243rpx; -height: 28rpx; -overflow-wrap: break-word; -font-size: 0; /* 小程序中不支持设置为 0 */ -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -margin: 8rpx 0 0 35rpx; -} - -.text_3 { -width: 243rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -} - -.text_4 { -width: 243rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(4, 184, 173, 1); -font-size: 30rpx; -font-family: PingFang-SC-Bold; -font-weight: 700; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -} - -.text-wrapper_2 { -background-color: rgba(57, 116, 246, 1); -border-radius: 28rpx; -height: 56rpx; -margin-left: 185rpx; -width: 120rpx; -} - -.text_5 { -width: 59rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(255, 255, 255, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -margin: 14rpx 0 0 31rpx; -} -.box_4 { -width: 176rpx; -height: 36rpx; -/* margin-left: 30rpx; */ -display: flex; -align-items: center; -margin-top: 10rpx; -} - -.text-wrapper_24 { -background-color: rgba(236, 236, 236, 0.5); -border-radius: 4rpx; -height: 36rpx; -width: 60rpx; -} - -.text_63 { -width: 45rpx; -height: 23rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 24rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 42rpx; -margin: 7rpx 0 0 8rpx; -} - -.text-wrapper_25 { -margin-left: 10rpx; -background-color: rgba(236, 236, 236, 0.5); -border-radius: 4rpx; -height: 36rpx; -width: 110rpx; -} - -.text_64 { -width: 94rpx; -height: 23rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 24rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 42rpx; -margin: 7rpx 0 0 8rpx; -} -.text-wrapper_5{ -margin-top: 20rpx; -} -.text-wrapper_5, -.text-wrapper_6, -.text-wrapper_7{ -width: 639rpx; -height: 28rpx; -overflow-wrap: break-word; -font-size: 0; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -margin: 24rpx 0 0 0; -/* display: flex; */ -/* text-align: left; */ -} - -.text_9, -.text_11, -.text_13 { -width: 476rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -white-space: nowrap; -line-height: 40rpx; - -} - -.text_8 { -width: 639rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -} - -.text_10 { -width: 476rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -} - -.text_12 { -width: 537rpx; -height: 28rpx; -overflow-wrap: break-word; -color: rgba(153, 153, 153, 1); -font-size: 30rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 40rpx; -} - -.image_3 { -width: 650rpx; -height: 1rpx; -margin: 30rpx 0 0 31rpx; -} -.box_5, -.box_6 { -width: 649rpx; -height: 32rpx; -margin: 30rpx 0 0 30rpx; -display: flex; -margin-left: 0; -} - -.text_14 { -width: 245rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(57, 116, 246, 1); -font-size: 32rpx; -font-family: PingFang-SC-Bold; -font-weight: 700; -text-align: right; -white-space: nowrap; -line-height: 45rpx; -} - -.text-wrapper_8 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -font-size: 0; /* 小程序中不支持设置为 0 */ -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: right; -white-space: nowrap; -line-height: 45rpx; -margin: 1rpx 0 0 45rpx; -} - -.text_15, -.text_16, -.text_17, -.text_18 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} -.text_19 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text_20 { -width: 121rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: right; -white-space: nowrap; -line-height: 45rpx; -margin-left: 45rpx; -} - -.block_4 { -background-color: rgba(57, 116, 246, 1); -border-radius: 2rpx; -width: 246rpx; -height: 6rpx; -margin: 10rpx 100rpx 0 12rpx; -} - - - -.text-wrapper_9 { -width: 194rpx; -height: 31rpx; -overflow-wrap: break-word; -font-size: 0; /* 小程序中不支持设置为 0 */ -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: right; -white-space: nowrap; -line-height: 45rpx; -} - -.text_21, -.text_22 { -width: 194rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} -.text_23 { -width: 194rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text_24 { -width: 194rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(242, 114, 37, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text_25 { -width: 194rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text-wrapper_10 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -font-size: 0; /* 小程序中不支持设置为 0 */ -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: right; -white-space: nowrap; -line-height: 45rpx; -margin-left: 45rpx; -} - -.text_26, -.text_27, -.text_28 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} -.text_29 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(28, 185, 175, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text_30 { -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(4, 184, 173, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} -.china{ - position: absolute; - left: 90.4pt; -} -.text_31, -.text_33{ -width: 193rpx; -height: 31rpx; -overflow-wrap: break-word; -color: rgba(51, 51, 51, 1); -font-size: 32rpx; -font-family: PingFang-SC-Medium; -font-weight: 500; -text-align: left; -white-space: nowrap; -line-height: 45rpx; -} - -.text_33{ -text-align: right; -margin: 1rpx 0 0 39rpx; -} - - -/* subpages/addResi/pages/addResi/addResi.wxss */ -page { -width: 100%; -min-height: 100vh; -overflow-y: auto; -background-color: #f7f7f7; -} -.gray{ -color: #C1C1C1; -} -.m-top20{ -margin-top: 20rpx; -} -.asterisk { - color: red; - margin-right: 11rpx; - position: absolute; /* 开启绝对定位 */ - left: 15rpx; /* 将星号放置在左侧 */ -} -.header { -width: 100%; -height: 444rpx; -overflow: hidden; -/* position: fixed; -top: 0; -left: 0; -z-index: 1000; */ -} -.header .header-bg { -width: 100%; -height: 444rpx; -position: absolute; -height: 100%; -z-index: -999; -} -.back { -width: 30rpx; -height: 30rpx; -margin-left: 20rpx; -position: absolute; -margin-top: 20rpx; -border-radius: 0rpx; -z-index: 101; -} -.header .navigation { -width: 100%; -display: flex; -align-items: center; -justify-content: center; -color: #333333; -font-size: 32rpx; -position: relative; -z-index: 100; -} -.header .content{ -margin: 160rpx 0 0 50rpx; -} -.header .content .h2{ -font-size: 44rpx; -font-family: PingFang SC; -font-weight: 800; -color: #333333; -margin-bottom: 28rpx; -} -.header .content .tag{ -width: 200rpx; -height: 50rpx; -position: relative; -line-height: 48rpx; -font-size: 28rpx; -font-family: PingFang SC; -font-weight: 500; -color: #94A6C2; -padding-left: 15rpx; -} -.header .content .tag b { -color: #FF2A00; -} -.header .content .tag image { -width: 170rpx; -height: 50rpx; -position: absolute; -top: 0; -left: 0; -z-index: -888; -} -.content{ -width: 100%; -height: auto; -padding: 0 20rpx; -box-sizing: border-box; -position: relative; -top: -30rpx; -} -.form_card { -background-color: #fff; -border-radius: 10rpx; -padding: 0 30rpx; -box-sizing: border-box; -height: auto; -margin-left: 0rpx; -} -.form_card > .title{ -height: 90rpx; -line-height: 90rpx; -font-size: 34rpx; -font-family: PingFang SC; -font-weight: bold; -color: #333333; -position: relative; -} -.form_card .title .tag{ -width: 10rpx; -height: 28rpx; -background: #3A80E7; -border-radius: 4rpx; -position: absolute; -left: -30rpx; -top: 50%; -transform: translateY(-14rpx); -} -.form_card .form_item{ -display: flex; -align-items: center; -border-top: 1px solid #EAEAEA; -height: 100rpx; -} -.form_card .form_house{ -height: 139rpx; -display: flex; -flex-direction: column; -} -.form_card .form_house .form_bottom{ -font-size: 24rpx; -color:#C1C1C1; -position: relative; -top: -10rpx; -} -/* .form_card .form_house .form_bottom text{ -color:#3A80E7 ; -} */ -.form_card .form_item .label{ -min-width: 130rpx; -height: 100%; -line-height: 100rpx; -font-size: 32rpx; -font-family: PingFang SC; -font-weight: 500; -color: #666666; -position: relative; -} -.form_card .form_item .label .must{ -font-size: 32rpx; -font-weight: 500; -color: #FF2A00; -position: absolute; -left: -18rpx; -top: 50%; -transform: translateY(-50rpx); -} -.form_card .form_item .input{ -flex: 1; -display: flex; -justify-content: space-around; -align-items: center; -margin-left: 51rpx; -overflow: hidden; - -} -.form_card .form_item .input .residentCategorySty{ -flex: 1; -overflow: hidden; -text-overflow: ellipsis; -white-space: nowrap; -} -.form_card .form_item .input picker, -.form_card .form_item .input input{ -flex: 1; -} -.form_card .form_item .input image{ -height: 22rpx; -width: 22rpx; -} -.btn-container { -display: flex; -justify-content: space-around; -width: 100%; -margin-top: 30rpx; -} - -.bottom_btn { -width: 200rpx; -height: 86rpx; -background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%); -border-radius: 43rpx; -text-align: center; -color: rgb(0, 0, 0); -line-height: 86rpx; -} -.bottom_btn1 { -width: 200rpx; -height: 86rpx; -background:#fff; -border-radius: 43rpx; -text-align: center; -color: rgb(8, 8, 8); -line-height: 86rpx; -} - -.text-right { -text-align: right!important; -justify-content: flex-end!important; -} -.horizontal-line { -border-bottom: 1px solid black; /* 设置水平线的样式和颜色 */ -width: 100%; /* 设置水平线的宽度 */ -margin: 10px 0; /* 可选：设置水平线的上下间距 */ -} \ No newline at end of file diff --git a/subpages/searchResult/pages/punchCard/punchCard.js b/subpages/searchResult/pages/punchCard/punchCard.js deleted file mode 100644 index 0932dcd..0000000 --- a/subpages/searchResult/pages/punchCard/punchCard.js +++ /dev/null @@ -1,916 +0,0 @@ -// subpages/searchResult/pages/punchCard/punchCard.js -import api from "../../../../utils/api" -var http = require('../../../../utils/request.js') -const QQMapWX = require('../../../../utils/qqmap-wx-jssdk') -import { $wuxDialog } from '../../../../components/dist/index' -const app = getApp() -var timerId = null; -Page({ - - /** - * 页面的初始数据 - */ - data: { - checkPassword:false, - form: {}, - resiId: "", - punchFlag: null, - currentTime: '', - address: '', - longitude: '', - latitude: '', - agencyLevel: '', - recentTime: '', - lastLog: {}, - tabList: [{ - name: '基础信息', - filledQty: "0", - totalQty: '1' - }, { - name: '基础信息', - filledQty: "0", - totalQty: '1' - }, { - name: '基础信息', - filledQty: "0", - totalQty: '1' - }], - originalExpandList: [{ - id: "healthDto", - title: "残疾信息", - scrollId: "disability", - children: [{ - label: "残疾类别", - itemType: "select1", - formName: "disabilityCategoryCode", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "disability_category_code" - }, - opction: [], - }, - { - label: "残疾等级", - itemType: "select1", - formName: "disabilityLevel", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "disability_level" - }, - opction: [], - }, - { - label: "残疾证号", - itemType: "input1", - formName: "disabilityNum", - }, - { - label: "残疾说明", - itemType: "input1", - formName: "disabilityDesc", - }, - { - label: "监护人", - itemType: "radio1", - formName: "guardianFlag", - opction: [{ - label: "有", - formName: "", - value: 1 - }, - { - label: "无", - formName: "", - value: 0 - }, - ], - }, - { - label: "监护人姓名", - itemType: "input1", - formName: "guardianName", - }, - { - label: "监护人联系电话", - itemType: "input1", - formName: "guardianMobile", - }, - { - label: "技能特长", - itemType: "radio1", - formName: "specialSkillFlag", - opction: [{ - label: "有", - formName: "", - value: 1 - }, - { - label: "无", - formName: "", - value: 0 - }, - ], - }, - { - label: "劳动能力", - itemType: "radio1", - formName: "workCapacityFlag", - opction: [{ - label: "有", - formName: "", - value: 1 - }, - { - label: "无", - formName: "", - value: 0 - }, - ], - }, - ], - }, - { - id: "seriousIllnessDto", - title: "大病信息", - scrollId: "serious_illness", - children: [{ - label: "所患大病", - itemType: "checkbox", - formName: "illnessCodes", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "illness_code" - }, - opction: [], - }, ], - }, - { - id: "chronicDiseaseDto", - title: "慢病信息", - scrollId: "chronic_disease", - children: [{ - label: "所患慢病", - itemType: "checkbox", - formName: "chronicDiseaseCodes", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "chronic_disease_code" - }, - opction: [], - }, ], - }, - { - id: "deathDto", - title: "死亡信息", - scrollId: "death", - children: [{ - label: "死亡时间", - itemType: "datepicker1", - formName: "deathTime", - }, ], - }, - { - id: "oldPeopleDto", - title: "老年人信息", - scrollId: "old_people", - children: [{ - label: "老年人分类", - itemType: "checkbox", - multiple: true, - formName: "oldPeopleCategories", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "oldPeople_categories" - }, - }, - { - label: "居住情况", - itemType: "select1", - formName: "resideSituation", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "reside_situation" - }, - }, - { - label: "高龄补助", - itemType: "inputNum", - formName: "oldSubsidy", - }, - ], - }, - { - id: "subsistenceAllowanceDto", - title: "低保信息", - scrollId: "subsistence_allowance", - children: [{ - label: "低保类别", - itemType: "select1", - formName: "category", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "subsistence_allowance_category" - }, - }, - { - label: "低保享受原因", - itemType: "checkbox", - formName: "reasons", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "subsistence_allowance_reasons" - }, - opction: [], - }, - ], - }, - { - id: "parymemberInfoDto", - title: "党员信息", - scrollId: "party_member", - children: [{ - label: "入党时间", - itemType: "datepicker1", - formName: "joinTime", - opction: [], - }, - { - label: "转正时间", - itemType: "datepicker1", - formName: "positiveTime", - opction: [], - }, - { - label: "所属党组织", - itemType: "cascader1", - formName: "partyOrgId", - opction: [], - }, - { - label: "流动党员", - itemType: "radio1", - formName: "flowFlag", - opction: [{ - label: "是", - value: 1 - }, - { - label: "否", - value: 0 - }, - ], - }, - { - label: "流动党员活动证号", - itemType: "input1", - formName: "flowActNum", - }, - { - label: "职务", - itemType: "select1", - formName: "partyJob", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "party_job" - }, - opction: [], - }, - { - label: "工作职责", - itemType: "input1", - formName: "duty", - }, - { - label: "是否退休", - itemType: "radio1", - formName: "retiredFlag", - opction: [{ - label: "是", - value: 1 - }, - { - label: "否", - value: 0 - }, - ], - }, - { - label: "党员中心户", - itemType: "radio1", - formName: "centerFlag", - opction: [{ - label: "是", - value: 1 - }, - { - label: "否", - value: 0 - }, - ], - }, - { - label: "免学习", - itemType: "radio1", - formName: "studyNotNeed", - opction: [{ - label: "是", - value: 1 - }, - { - label: "否", - value: 0 - }, - ], - }, - { - label: "入党时所在党支部", - itemType: "input1", - formName: "joinBranchName", - }, - { - label: "组织关系转入社区时间", - itemType: "datepicker1", - formName: "joinCommunityTime", - opction: [], - }, - ], - }, - { - id: "ensureHouseDto", - title: "保障房信息", - scrollId: "ensure_house", - children: [{ - label: "所在社区", - itemType: "input1", - formName: "liveCommunity", - }, - { - label: "住房性质", - itemType: "select1", - formName: "housingNature", - opctionUrl: "sys/dict/data/house", - opctionParams: { - formCode: "resi_base_info" - }, - opction: [], - }, - ], - }, - { - id: "veteranDto", - title: "退役军人信息", - scrollId: "veteran", - children: [{ - label: "入伍时间", - itemType: "datepicker1", - formName: "joinArmyTime", - opction: [], - }, - { - label: "退伍时间", - itemType: "datepicker1", - formName: "leaveArmyTime", - opction: [], - }, - { - label: "服役单位", - itemType: "input1", - formName: "serviceUnit", - }, - { - label: "接收单位", - itemType: "input1", - formName: "receiveUnit", - }, - { - label: "待安置补助金", - itemType: "inputNum", - formName: "settlementAmount", - opction: [], - }, - { - label: "培训状况", - itemType: "input1", - formName: "trainDesc", - }, - { - label: "现就业情况", - itemType: "input1", - formName: "employmentSituation", - }, - { - label: "是否办理公益性岗位", - itemType: "radio1", - formName: "pubWelfareJobFlag", - opction: [{ - label: "是", - value: 1 - }, - { - label: "否", - value: 0 - }, - ], - }, - ], - }, - { - id: "unitedFrontDto", - title: "统战人员信息", - scrollId: "united_front", - children: [{ - label: "统战类型", - itemType: "input1", - formName: "unitedFrontType", - }, ], - }, - { - id: "volunteerDto", - title: "志愿者信息", - children: [{ - label: "志愿者类别", - itemType: "checkbox", - formName: "volunteerCategory", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "VOLUNTEER_CATEGORY" - }, - opction: [], - }, ], - }, - { - id: "specialSupportDto", - title: "特扶人员信息", - scrollId: "special_support", - children: [{ - //0 - label: "特扶类别", - itemType: "select1", - formName: "specialSupportType", - opction: [{ - value: "1", - label: "失独", - }, - { - value: "2", - label: "伤残", - }, - ], - }, - { - //1 - label: "子女姓名", - itemType: "input1", - formName: "childName", - opction: [], - }, - { - //2 - label: "子女性别", - itemType: "select1", - formName: "childGender", - opction: [{ - value: "1", - label: "男", - }, - { - value: "2", - label: "女", - }, - ], - }, - { - label: "子女死亡日期", - itemType: "datepicker1", - formName: "childDeathDate", - opction: [], - }, - { - label: "子女伤残类别", - itemType: "select1", - formName: "childDisabilityCategoryCode", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "disability_category_code" - }, - opction: [], - }, - { - label: "子女伤残等级", - itemType: "select1", - formName: "childDisabilityLevel", - opctionUrl: "sys/dict/data/dictlist", - opctionParams: { - dictType: "disability_level" - }, - opction: [], - }, - ], - }, - ], - expandList: [], - activeType: 0, - tagList: [], - idTypeList: [{ - label: '其他', - value: 0 - }, - { - label: '身份证', - value: 1 - }, - { - label: '护照', - value: 2 - }, - { - label: '港澳通行证', - value: 3 - }, - { - label: '军人证', - value: 4 - }, - { - label: '台胞证', - value: 5 - } - ], - marriageList:[ - { - label:"未婚", - value:'weihun' - }, - { - label:"初婚", - value:'chuhun' - }, - { - label:"离婚", - value:'lihun' - }, - { - label:"再婚", - value:'zaihun' - }, - { - label:"复婚", - value:'fuhun' - } - ], - password:'Makui240345' - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - this.updateTime(); - timerId = setInterval(this.updateTime, 1000); - if (options.resiId) { - this.setData({ - resiId: options.resiId, - 'form.baseInfoDto.name':options.name, - 'form.baseInfoDto.idNum':options.idNum, - 'form.baseInfoDto.mobile':options.mobile, - - }) - this.getResiInfo() - } - // this.data.qqMapWX = new QQMapWX({ - // key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ' - // }) - // this.reverseLocation() - this.setData({ - agencyLevel: app.globalData.user.level - }) - // this.getLastLogs() - }, - updateTime() { - let date = new Date(); - let hours = date.getHours().toString().padStart(2, '0'); - let minutes = date.getMinutes().toString().padStart(2, '0'); - let seconds = date.getSeconds().toString().padStart(2, '0'); - this.setData({ - currentTime: `${hours}:${minutes}:${seconds}` - }); - }, - getResiInfo: async function () { - try { - let res = await api.getResiInfo(this.data.resiId); - let marriageName = '--' - if (res.data.residentCategoryStr) { - res.data.baseInfoDto.categoryInfo.categoryNames = res.data.residentCategoryStr.split(',') - } - if(res.data.familyInfoDto.marriage){ - marriageName = this.data.marriageList.filter(item=>item.value == res.data.familyInfoDto.marriage)[0].label - } - // 处理tab - this.setData({ - form: res.data, - marriageName:marriageName - }); - await this.updateTabList(res.data.integrityData.integrityQtyMap) - - } catch (err) { - console.log(err); - } - }, - updateTabList: async function (value) { - const nameMap = { - reside: "居住信息", - ext: "拓展信息", - united_front: "统战人员信息", - party_member: "党员信息", - death: "死亡信息", - disability: "残疾信息", - subsistence_allowance: "低保信息", - serious_illness: "大病信息", - veteran: "退役军人信息", - special_support: "特扶人员信息", - old_people: "老年人信息", - ensure_house: "保障房信息", - chronic_disease: "慢病信息", - base: "基本信息", - }; - let list = Object.entries( - value - ) - .map(([key, value]) => ({ - name: nameMap[key], - id: key, - filledQty: value.filledQty, - totalQty: value.totalQty, - })) - .reverse(); - this.setData({ - tabList: list - }) - let arr = this.data.tabList.filter( - (item) => - item.filledQty > 0 || ( - item.name == "拓展信息" || - item.name == "基本信息") - ); - let arrs = [] - arrs = this.data.originalExpandList.filter((itemA) => { - return arr.some((itemB) => itemB.name === itemA.title); - }); - await Promise.all( - arrs.map(async (item) => { - await Promise.all( - item.children.map(async (child) => { - const key = child.formName; - if (this.data.form[item.id].hasOwnProperty(key)) { - child.value = await this.getDictName( - child.opctionUrl, - child.opctionParams, - this.data.form[item.id][ - key == "partyOrgId" ? "branchId" : key - ], - child.itemType, - child.opction - ); - } - }) - ); - }) - ); - this.setData({ - expandList: arrs - }) - console.log(arrs); - console.log(arr); - }, - getDictName: async function (url, params, value, itemType, opction) { - try { - if (url) { - const { - data - } = await http.post(url, params); - if (itemType == "checkbox") { - const matchedLabels = value - .map((item) => { - const matchedItems = data.filter( - (obj) => obj.value === item - ); - if (matchedItems.length > 0) { - return matchedItems - .map((matchedItem) => matchedItem.label) - .join(","); - } else { - return ""; - } - }) - .join("，"); - return matchedLabels ? matchedLabels : "--"; - } else if (itemType == "select1") { - const matchedItem = data.find((item) => item.value === value); - return matchedItem ? matchedItem.label : "--"; - } - } else { - if (itemType == "radio1") { - const matchedItem = opction.find((item) => item.value === value); - return matchedItem ? matchedItem.label : "--"; - } else if ( - itemType == "input1" || - itemType == "datepicker1" || - itemType == "cascader1" - ) { - return value ? value : "--"; - } - } - } catch (error) { - console.log(error); - } - }, - handlePunch() { - this.setData({ - // punchFlag:!this.data.punchFlag, - animationClass: 'animate' - }) - setTimeout(() => { - this.setData({ - animationClass: '' - }); - this.clockRecords() - - }, 1500); - }, - clockRecords() { - let currentDate = new Date().toISOString().split('T')[0]; // 会得到形如 "2023-09-27" 的日期 - let obj = { - resiId: this.data.resiId, - clockTime: currentDate + " " + this.data.currentTime, - clockAddress: this.data.address, - longitude: this.data.longitude, - latitude: this.data.latitude - } - api.clockRecords(obj).then(res => { - wx.showToast({ - // title: this.data.punchFlag?'打卡成功':'更新成功', - title: '打卡成功', - icon: 'none' - }) - }).catch(err => { - console.log(err); - }) - }, - toAddResi() { - this.setData({ - checkPassword:true - }) - }, - bindPassword(e){ - this.setData({ - password:e.detail.value - }) - }, - onClosePassword(){ - this.setData({ - checkPassword:false - }) - }, - onConfirmassword(){ - let parm = { - password:this.data.password - } - api.getResiUserInfo(this.data.resiId,parm).then(res=>{ - if(res.code === 0){ - wx.navigateTo({ - url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${this.data.resiId}&name=${res.data.name}&mobile=${res.data.mobile}&idNum=${res.data.idNum}`, - }) - this.setData({ - password:null - }) - }else{ - this.setData({ - password:null - }) - this.showToast(res.msg) - } - }).catch(err=>{ - console.log(err); - }) - }, - toWebView() { - console.log(app.globalData); - if (app.globalData.questionnaireUrl) { - - wx.navigateTo({ - url: '/pages/webView/webView?url=' + app.globalData.questionnaireUrl, - }) - } else { - wx.showToast({ - icon: "none", - title: '未创建满意度调查问卷', - }) - } - }, - toEvent() { - let obj = { - resiId: this.data.resiId, - resiMobile: this.data.form.mobile, - resiName: this.data.form.name - } - wx.setStorageSync('resiDetail', obj) - wx.navigateTo({ - url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck', - }) - }, - reverseLocation() { - const _this = this - this.data.qqMapWX.reverseGeocoder({ - success(res) { - _this.setData({ - addressContent: res.result.address, - address: res.result.address, - longitude: res.result.location.lng, - latitude: res.result.location.lat, - }) - }, - fail(err) { - console.debug(err) - } - }) - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - if (timerId) { - clearInterval(timerId); - timerId = null; - } - }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - }, - gotopage(e) { - wx.navigateTo({ - url: e.currentTarget.dataset.url, - }) - }, - // getLastLogs() { - // api.getLastLog({ - // resiId: this.data.resiId - // }).then(res => { - // this.setData({ - // lastLog: res.data - // }) - // }) - // }, - goResidentPortrait2() { - wx.navigateTo({ - url: '/subpages/statistics/pages/residentPortrait2/residentPortrait?id=' + this.data.resiId, - }) - }, - - handelClickTab: function(e) { - wx.pageScrollTo({ - selector: `#${e.currentTarget.dataset.item.id}`, - duration:300 - }); - this.setData({ - activeType: e.currentTarget.dataset.index - }) - } -}) \ No newline at end of file diff --git a/subpages/searchResult/pages/punchCard/punchCard.json b/subpages/searchResult/pages/punchCard/punchCard.json deleted file mode 100644 index 6a8c2bf..0000000 --- a/subpages/searchResult/pages/punchCard/punchCard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - "van-dialog": "@vant/weapp/dialog/index" - }, - "navigationBarTitleText": "详情" -} \ No newline at end of file diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxml b/subpages/searchResult/pages/punchCard/punchCard.wxml deleted file mode 100644 index c79cf04..0000000 --- a/subpages/searchResult/pages/punchCard/punchCard.wxml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - {{form.baseInfoDto.name}} - 信息完整度： - {{form.integrityData.score}}% - - - {{item}} - - - - 编辑 - - - - 地址： - {{form - .resideInfoDtos[0].agencyName}}{{form.resideInfoDtos[0].homeName}} - - - 创建时间： - {{form.baseInfoDto.createdTime}} - - - 最近更新时间： - {{form.baseInfoDto.updatedTime}} - - - - {{item.name}} （{{ item.filledQty }}/{{ item.totalQty }}） - - - - - - 基础信息 - - - 国籍： - {{form.baseInfoDto.nationalityName|| '--' }} - - - 证件类型： - {{idTypeList[form.baseInfoDto.idType].label}} - - - 证件号： - {{form.baseInfoDto.idNum}} - - - 联系电话： - {{form.baseInfoDto.mobile}} - - - 文化程度： - {{form.eduInfoDto.cultureLevelName}} - - - - 性别： - {{form.baseInfoDto.genderName}} - - - 出生日期： - {{form.baseInfoDto.birthday}} - - - 民族： - {{form.baseInfoDto.nationName}} - - - 婚姻状况： - {{marriageName}} - - - - 籍贯： - {{form.baseInfoDto.nativePlace}} - - - - - {{item.title}} - - - {{itemC.label}}： - {{itemC.value|| '--' }} - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/subpages/searchResult/pages/punchCard/punchCard.wxss b/subpages/searchResult/pages/punchCard/punchCard.wxss deleted file mode 100644 index 993dec2..0000000 --- a/subpages/searchResult/pages/punchCard/punchCard.wxss +++ /dev/null @@ -1,241 +0,0 @@ -/* subpages/searchResult/pages/punchCard/punchCard.wxss */ -/**index.wxss**/ -page { - background-color: #f7f7f7; - height: auto; - overflow-y: scroll; - padding: 0 20rpx 160rpx ; - box-sizing: border-box; -} - -.form { - display: flex; - margin-top: 20rpx; -} - -.form .form_label { - font-size: 30rpx; - color: #999999; -} - -.form .form_value { - color: #333333; - text-align: left; - font-weight: 500; - flex: 1; -} - -.card { - background-color: #fff; - border-radius: 20rpx; - display: flex; - flex-direction: column; - margin-top: 20rpx; - padding: 30rpx 30rpx 40rpx; - box-sizing: border-box; - position: relative; - overflow: hidden; -} - -.card .title { - position: relative; - font-size: 34rpx; -} - -.card .title::after { - position: absolute; - left: -30rpx; - top: 8rpx; - content: " "; - width: 10rpx; - height: 28rpx; - background-color: #3A80E7; -} - -.info { - margin-top: 6rpx; -} - -.info .item { - display: flex; - margin-top: 28rpx; -} - -.info .item .label { - width: fit-content; -} - -.punch { - width: 260rpx; - height: 260rpx; - background: linear-gradient(180deg, #5E9FFF, #3A80E7); - box-shadow: 0rpx 4rpx 35rpx 0rpx rgba(61, 139, 248, 0.48); - color: #fff; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - border-radius: 50%; - margin: 50rpx auto 0; -} - -.address { - color: #666666; - font-size: 28rpx; - margin: 0 auto; - margin: 40rpx auto 30rpx; -} - -@keyframes rotateAnimation { - 0% { - transform: rotateY(0deg); - } - - 100% { - transform: rotateY(180deg); - } -} - -.animate { - animation: rotateAnimation 2s forwards; -} - -.btn { - box-sizing: border-box; - text-align: center; - height: 76rpx; - border-radius: 38rpx; - margin: 30rpx 0; - line-height: 76rpx; - border-radius: 76rpx; - border: 2rpx solid #999999; -} - -.blue{ - background-color:#3974f6; - color: #fff; - border-color: #3974f6; -} - -.flex-sb { - display: flex; - justify-content: space-between; -} - -.view { - color: #999; - font-size: 24rpx; -} - -.jm-btn { - position: absolute; - top: 30rpx; - right: 20rpx; - width: fit-content; - height: 56rpx; - padding: 0 20rpx; - box-sizing: border-box; - line-height: 56rpx; - background: #3974f6; - border-radius: 28rpx; - color: #fff; - text-align: center; - font-size: 28rpx; -} - -.tabs { - display: flex; - justify-content: start; - flex-wrap: wrap; - border-top: 1px solid #EAEAEA; - margin-top: 30rpx; -} - -.tabs .tab_item { - display: flex; - margin-right: 20rpx; - padding-bottom: 10rpx; - width: auto; - margin-top: 20rpx; - justify-content: center; -} - -.tabs .tab_item .num { - font-weight: 400; - font-size: 36rpx; -} - -.tabs .tab_item .name { - font-size: 26rpx; - padding-bottom: 6rpx; - box-sizing: border-box; - color: #666666; -} - - - -.top { - display: flex; - align-items: center; -} - -.top .left { - flex: 1; -} - -.top .right { - width: 130rpx; - -} - -.top .left .name { - display: flex; -} - -.top .left .tags { - display: flex; - flex-grow: 0; - justify-content: start; - max-width: 645rpx; - overflow-x: scroll; - margin-top: 20rpx; - box-sizing: border-box; -} -.top .left .tags::-webkit-scrollbar { - display: none; - } -.top .left .tags .tag { - background-color: rgba(236, 236, 236, 0.500000); - border-radius: 4rpx; - margin-right: 6rpx; - white-space: nowrap; - padding: 7rpx 8rpx; - width: auto; - box-sizing: border-box; - font-weight: 500; - font-size: 24rpx; - color: #999999; -} -.border_bto{ - color: #3974f6 !important; - border-bottom: solid 6rpx #3974f6; -} - -.bto_btn{ - position: fixed; - bottom: 0; - display: flex; - justify-content: space-between; - align-items: center; - left: 0; - right: 0; - padding:0 20rpx; - box-sizing: border-box; - background: #fff; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); -} -.dialog{ - padding: 0 20rpx; - box-sizing: border-box; -} \ No newline at end of file diff --git a/subpages/searchResult/pages/searchResult/searchResult.js b/subpages/searchResult/pages/searchResult/searchResult.js index 399ae0c..fc683b2 100644 --- a/subpages/searchResult/pages/searchResult/searchResult.js +++ b/subpages/searchResult/pages/searchResult/searchResult.js @@ -160,7 +160,7 @@ Page({ if(this.data.type == 'resi'){ wx.navigateTo({ - url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${e.currentTarget.dataset.item.resiId}`, + url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.resiId}`, }) }else{