diff --git a/components/Tabs/index.js b/components/Tabs/index.js
index 1fdb5be..e1ad35e 100644
--- a/components/Tabs/index.js
+++ b/components/Tabs/index.js
@@ -9,10 +9,11 @@ Component({
},
methods: {
tabChange(e) {
+ let index = e.currentTarget.dataset.index
this.setData({
- cur: e.currentTarget.dataset.index
+ cur: index
})
- this.triggerEvent("tabChange",e.currentTarget.dataset.index)
+ this.triggerEvent("tabChange",{index})
}
}
});
diff --git a/images/statistics/arrow_down.png b/images/statistics/arrow_down.png
new file mode 100644
index 0000000..7beaa8a
Binary files /dev/null and b/images/statistics/arrow_down.png differ
diff --git a/images/statistics/btn_right.png b/images/statistics/btn_right.png
new file mode 100644
index 0000000..2379ecb
Binary files /dev/null and b/images/statistics/btn_right.png differ
diff --git a/images/statistics/hx_bg.png b/images/statistics/hx_bg.png
new file mode 100644
index 0000000..5a296fe
Binary files /dev/null and b/images/statistics/hx_bg.png differ
diff --git a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxml b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxml
index 03bfb1a..59af2ad 100644
--- a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxml
+++ b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxml
@@ -1,5 +1,44 @@
-
+
-
+
不满意人员画像
-
\ No newline at end of file
+
+
+
+ 基础教育
+
+
+
+
+
+
+
+
+
+ 第一网格
+
+
+ 30-40岁
+
+
+ 流动人员
+
+
+ 月收入5000以下
+
+
+ 专科
+
+
+ 已婚
+
+
+ 男
+
+
+
+
+
+ 按画像匹配到同类：570人
+
+
diff --git a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
index 6f1f139..c50d808 100644
--- a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
+++ b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
@@ -7,8 +7,128 @@
align-items: center;
margin: 30rpx 0;
}
+
.sub-tit image {
margin-right: 12rpx;
width: 20rpx;
height: 20rpx;
+}
+
+.portrait {
+ position: relative;
+ width: 633rpx;
+ height: 542rpx;
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #3A80E7;
+ line-height: 36rpx;
+}
+
+.portrait .tag {
+ position: absolute;
+ background: #f4f8fe;
+ padding: 30rpx;
+ width: 129rpx;
+ height: 129rpx;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ text-align: center;
+}
+
+.portrait .tag:after {
+ content: "";
+ display: block;
+ width: calc(100% - 28rpx);
+ height: calc(100% - 28rpx);
+ position: absolute;
+ left: 14rpx;
+ top: 14rpx;
+ background: #d3e3fa;
+ border-radius: 50%;
+}
+.portrait .tag .text {
+ position: relative;
+ z-index: 2;
+}
+.portrait .tag:nth-of-type(1) {
+ padding: 38rpx;
+ width: 163rpx;
+ height: 163rpx;
+ left: 277rpx;
+ top: 0;
+}
+.portrait .tag:nth-of-type(2) {
+ padding: 24rpx;
+ width: 121rpx;
+ height: 121rpx;
+ right: 58rpx;
+ top: 101rpx;
+}
+.portrait .tag:nth-of-type(3) {
+ width: 145rpx;
+ height: 145rpx;
+ right: 0rpx;
+ top: 249rpx;
+}
+.portrait .tag:nth-of-type(4) {
+ width: 163rpx;
+ height: 163rpx;
+ right: 100rpx;
+ bottom: 0;
+}
+.portrait .tag:nth-of-type(5) {
+ left: 99rpx;
+ bottom: 10rpx;
+}
+.portrait .tag:nth-of-type(6) {
+ left: 0rpx;
+ top: 251rpx;
+}
+.portrait .tag:nth-of-type(7) {
+ left: 53rpx;
+ top: 101rpx;
+}
+.btn {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #333333;
+ line-height: 42rpx;
+ background: #F1F6FF;
+ border: 1px solid #3A80E7;
+ border-radius: 20rpx;
+ padding: 25rpx 30rpx;
+ margin-top: 50rpx;
+}
+.btn image {
+ width: 30rpx;
+ height: 30rpx;
+}
+.bg {
+ width: 384rpx;
+ height: 348rpx;
+ position: absolute;
+ left: calc(50% - 192rpx);
+ top: calc(50% - 174rpx);
+}
+.bg image {
+ width: 100%;
+ height: 100%;
+}
+.picker {
+ width: 180rpx;
+ background: #3A80E7;
+ border-radius: 27rpx;
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ padding: 15rpx 21rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/pages/statistics/statistics.js b/pages/statistics/statistics.js
index 1bd80a7..7915284 100644
--- a/pages/statistics/statistics.js
+++ b/pages/statistics/statistics.js
@@ -31,5 +31,10 @@ Page({
this.setData({
monthIndex: index
})
+ },
+ gotopage() {
+ wx.navigateTo({
+ url: '/pages/login/login',
+ })
}
})
\ No newline at end of file
diff --git a/pages/statistics/statistics.json b/pages/statistics/statistics.json
index 5368563..b9f2be6 100644
--- a/pages/statistics/statistics.json
+++ b/pages/statistics/statistics.json
@@ -6,7 +6,7 @@
"SmyddcSqmydzc": "./modules/SmyddcSqmydzc/SmyddcSqmydzc",
"HotlineComplaints": "./modules/HotlineComplaints/HotlineComplaints",
"EventPrediction": "./modules/EventPrediction/EventPrediction",
- "CrowdPortrait": "./modules/CrowdPortrait/CrowdPortrait"
+ "CrowdPortrait": "./modules/CrowdPortrait/CrowdPortrait",
"custom-tab-bar":"../../components/custom-tab-bar"
}
}
\ No newline at end of file
diff --git a/pages/statistics/statistics.wxml b/pages/statistics/statistics.wxml
index 3bb7258..78a841a 100644
--- a/pages/statistics/statistics.wxml
+++ b/pages/statistics/statistics.wxml
@@ -1,5 +1,4 @@
-