Merge remote-tracking branch 'origin/jw-featrue-zhanlibiao' into dev

app.json

@@ -7,7 +7,8 @@
         "pages/work/work",
         "pages/information/information",
         "pages/mine/mine",
-        "pages/webView/webView"
+        "pages/webView/webView",
+        "pages/statistics/statistics"
     ],
     "subPackages": [
         {
@@ -49,6 +50,16 @@
                 "pages/followUpList/followUpList",
                 "pages/followUpDetail/followUpDetail"
             ]
+        },
+        {
+            "root": "subpages/statistics",
+            "name": "statistics",
+            "pages": [
+                "pages/dissatisfied/list/list",
+                "pages/dissatisfied/detial/detail",
+                "pages/crowdPortrait/crowdPortrait",
+                "pages/residentPortrait/residentPortrait"
+            ]
         }
     ],
     "window": {
@@ -75,6 +86,12 @@
                 "iconPath": "images/home/work.png",
                 "selectedIconPath": "images/home/workSelected.png"
             },
+            {
+                "pagePath": "pages/statistics/statistics",
+                "text": "统计",
+                "iconPath": "images/home/information.png",
+                "selectedIconPath": "images/home/informationSelected.png"
+            },
             {
                 "pagePath": "pages/mine/mine",
                 "text": "我的",

pages/statistics/statistics.js

@@ -0,0 +1,12 @@
+const app = getApp()
+Page({
+    data: {
+    },
+    onLoad(options) {
+        this.setData({
+            statusHeight: app.globalData.deviceInfo.statusHeight,
+            navigationHeight: app.globalData.deviceInfo.navigationHeight,
+            agencyName:app.globalData.user.agencyName,
+        })
+    }
+})

pages/statistics/statistics.json

@@ -0,0 +1,4 @@
+{
+    "navigationStyle": "custom",
+    "usingComponents": {}
+}

pages/statistics/statistics.wxml

@@ -0,0 +1,7 @@
+<view class="header">
+    <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
+        <image src="../../images/work/header_left.png" mode=""/> {{agencyName}}
+    </view>
+
+
+</view>

pages/statistics/statistics.wxss

@@ -0,0 +1,34 @@
+
+.header {
+    width: 100%;
+    height: 470rpx;
+    /* position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1000; */
+    background: linear-gradient(180deg, #116FED 0%, #66A6FD 63%, #F7F7F7 100%);
+    overflow: hidden;
+}
+.header .header-bg {
+    width: 100%;
+    height: 444rpx;
+    position: absolute;
+    height: 100%;
+    z-index: -999;
+}
+.header .navigation {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: start;
+    color: #fff;
+    font-size: 32rpx;
+    position: relative;
+    padding-left: 20rpx;
+    z-index: 100;
+}
+.header .navigation image{
+    width: 34rpx;
+    height: 34rpx;
+    margin-right: 17rpx;
+}

subpages/statistics/pages/crowdPortrait/crowdPortrait.js

@@ -0,0 +1,66 @@
+// subpages/statistics/pages/crowdPortrait/crowdPortrait.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

subpages/statistics/pages/crowdPortrait/crowdPortrait.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "画像匹配人员",
+    "usingComponents": {}
+}

subpages/statistics/pages/crowdPortrait/crowdPortrait.wxml

@@ -0,0 +1,2 @@
+<!--subpages/statistics/pages/crowdPortrait/crowdPortrait.wxml-->
+<text>subpages/statistics/pages/crowdPortrait/crowdPortrait.wxml</text>

subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss

@@ -0,0 +1 @@
+/* subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss */

subpages/statistics/pages/dissatisfied/detial/detail.js

@@ -0,0 +1,66 @@
+// subpages/statistics/pages/dissatisfied/detial/detail.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

subpages/statistics/pages/dissatisfied/detial/detail.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "详情",
+    "usingComponents": {}
+}

subpages/statistics/pages/dissatisfied/detial/detail.wxml

@@ -0,0 +1,2 @@
+<!--subpages/statistics/pages/dissatisfied/detial/detail.wxml-->
+<text>subpages/statistics/pages/dissatisfied/detial/detail.wxml</text>

subpages/statistics/pages/dissatisfied/detial/detail.wxss

@@ -0,0 +1 @@
+/* subpages/statistics/pages/dissatisfied/detial/detail.wxss */

subpages/statistics/pages/dissatisfied/list/list.js

@@ -0,0 +1,66 @@
+// subpages/statistics/pages/dissatisfied/list/list.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

subpages/statistics/pages/dissatisfied/list/list.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "不满意事项详细",
+    "usingComponents": {}
+}

subpages/statistics/pages/dissatisfied/list/list.wxml

@@ -0,0 +1,2 @@
+<!--subpages/statistics/pages/dissatisfied/list/list.wxml-->
+<text>subpages/statistics/pages/dissatisfied/list/list.wxml</text>

subpages/statistics/pages/dissatisfied/list/list.wxss

@@ -0,0 +1 @@
+/* subpages/statistics/pages/dissatisfied/list/list.wxss */

subpages/statistics/pages/residentPortrait/residentPortrait.js

@@ -0,0 +1,66 @@
+// subpages/statistics/pages/residentPortrait/residentPortrait.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

subpages/statistics/pages/residentPortrait/residentPortrait.json

@@ -0,0 +1,4 @@
+{
+    "navigationBarTitleText": "居民画像",
+    "usingComponents": {}
+}

subpages/statistics/pages/residentPortrait/residentPortrait.wxml

@@ -0,0 +1,2 @@
+<!--subpages/statistics/pages/residentPortrait/residentPortrait.wxml-->
+<text>subpages/statistics/pages/residentPortrait/residentPortrait.wxml</text>

subpages/statistics/pages/residentPortrait/residentPortrait.wxss

@@ -0,0 +1 @@
+/* subpages/statistics/pages/residentPortrait/residentPortrait.wxss */