修改样式

components/Tabs/index.wxss

@@ -6,7 +6,7 @@
     border: 2px solid #D6E6FC;
     border-radius: 6rpx;
     flex: 1;
-    padding: 25rpx 0;
+    padding: 25rpx 20rpx;
     font-size: 30rpx;
     font-weight: 500;
     color: #999999;

pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss

@@ -123,7 +123,7 @@
 .picker {
     width: 180rpx;
     background: #3A80E7;
-    border-radius: 27rpx;
+    border-radius: 1000rpx;
     font-size: 28rpx;
     font-weight: 500;
     color: #FFFFFF;
@@ -131,4 +131,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
+}
+.picker image {
+  margin-left: 5px;
 }

pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.js

@@ -1,353 +1,371 @@
 import * as echarts from '../../../../ec-canvas/echarts';
-import {satisfactionGroup, event12345Group} from "../../../../utils/statisticsApi";
+import { satisfactionGroup, event12345Group } from "../../../../utils/statisticsApi";
 
 var chart;
 
 function initChart(canvas, width, height, dpr) {
-    chart = echarts.init(canvas, null, {
+  chart = echarts.init(canvas, null, {
-        width: width,
+    width: width,
-        height: height,
+    height: height,
-        devicePixelRatio: dpr // 像素比
+    devicePixelRatio: dpr // 像素比
-    });
+  });
-    canvas.setChart(chart);
+  canvas.setChart(chart);
-    return chart;
+  return chart;
 }
 
 const formatTime = date => {
-    const year = date.getFullYear()
+  const year = date.getFullYear()
-    const month = date.getMonth() + 1
+  const month = date.getMonth() + 1
-    const day = date.getDate()
+  const day = date.getDate()
-    return [year, month, day].map(formatNumber).join('-')
+  return [year, month, day].map(formatNumber).join('-')
 }
 const formatNumber = n => {
-    n = n.toString()
+  n = n.toString()
-    return n[1] ? n : '0' + n
+  return n[1] ? n : '0' + n
 }
 Component({
-    properties: {
+  properties: {
-        typeCondition: {
+    typeCondition: {
-            type: Number,
+      type: Number,
-            value: 0,
+      value: 0,
-            observer(val) {
+      observer(val) {
-                console.log(val, 11)
+        console.log(val, 11)
-                this.getData()
+        this.getData()
-            }
+      }
-        }
+    }
+  },
+  data: {
+    ec: {
+      lazyLoad: true
+      // onInit: initChart
     },
-    data: {
+    tabList: [{
-        ec: {
+      label: "按满意度调查/社区自查结果",
-            lazyLoad: true
+      value: 1
-            // onInit: initChart
+    }, {
-        },
+      label: '按12345热线投诉结果',
-        tabList: [{
+      value: 2
-            label: "按满意度调查/社区自查结果",
+    }],
-            value: 1
+    tabValue: 1
-        }, {
+  },
-            label: '按12345热线投诉结果',
+  lifetimes: {
-            value: 2
+    ready() {
-        }],
+      this.getData()
-        tabValue: 1
+    }
+  },
+  methods: {
+    tabChange({ detail }) {
+      this.setData({
+        tabValue: this.data.tabList[detail].value
+      })
+      this.getData()
     },
-    lifetimes: {
+    getData() {
-        ready() {
+      this.selectComponent('#smyddcSqmydzc').init((canvas, width, height, dpr) => {
-            this.getData()
+        chart = echarts.init(canvas, null, {
+          width: width,
+          height: height,
+          devicePixelRatio: dpr // 像素比
+        });
+        canvas.setChart(chart);
+        let params = {
+          startTime: '',
+          endTime: ''
         }
-    },
+        let now = new Date();
-    methods: {
+        if (this.data.typeCondition === 0) {
-        tabChange({detail}) {
+          params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 1))
-            this.setData({
+        }
-                tabValue: this.data.tabList[detail].value
+        if (this.data.typeCondition === 1) {
-            })
+          params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 1));
-            this.getData()
+        }
-        },
+        if (this.data.typeCondition === 2) {
-        getData() {
+          params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 2));
-            this.selectComponent('#smyddcSqmydzc').init((canvas, width, height, dpr) => {
+        }
-                chart = echarts.init(canvas, null, {
+        if (this.data.typeCondition === 3) {
-                    width: width,
+          params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 5));
-                    height: height,
+        }
-                    devicePixelRatio: dpr // 像素比
+        if (this.data.typeCondition === 4) {
-                });
+          params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 11));
-                canvas.setChart(chart);
+        }
-                let params = {
+
-                    startTime: '',
+        if (this.data.typeCondition === 1) {
-                    endTime: ''
+          params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59))
+        } else {
+          params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59))
+        }
+        console.log(params)
+        console.log(this.data.tabValue, 'this.data.tabValue')
+        if (this.data.tabValue === 1) {
+          satisfactionGroup(params).then(({ data }) => {
+            var dataname = data.map(item => item.name)
+            var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
+            var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
+            var indicator = []
+            let max = Math.max(...datavaule, ...datavaule2)
+            console.log(max)
+            var datamax = new Array(datavaule.length).fill(max)
+            for (var i = 0; i < dataname.length; i++) {
+              indicator.push({
+                name: dataname[i],
+                max: datamax[i],
+              })
+            }
+            indicator[0].axisLabel = {show: true}
+
+            let legendName = ['省满意度调查各项\n不满意人数', '社区满意度自查各项\n不满意人数']
+            let series = [{
+              name: "省满意度调查各项\n不满意人数",
+              type: "radar",
+              symbol: "circle",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  color: 'rgba(58,128,231,0.36)',
                 }
-                let now = new Date();
+              },
-                if (this.data.typeCondition === 0) {
+              axisLabel: {
-                    params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 1))
+                show: true,
+              },
+              triggerEvent: true,
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "transparent",
+                },
+              },
+              splitLine: {
+                show: true,
+                lineStyle: {
+                  color: "#527AA8",
+                },
+              },
+              itemStyle: {
+                color: '#3A80E7',
+                borderColor: '#3AB7FF',
+                borderWidth: 1,
+              },
+              lineStyle: {
+                normal: {
+                  color: "#3AB7FF",
+                  width: 2
                 }
-                if (this.data.typeCondition === 1) {
+              },
-                    params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 1));
+              data: [datavaule]
+            }, {
+              name: "社区满意度自查各项\n不满意人数",
+              type: "radar",
+              symbol: "circle",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  color: 'rgba(170, 216, 255, 0)',
                 }
-                if (this.data.typeCondition === 2) {
+              },
-                    params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 2));
+              itemStyle: {
+                color: '#EB8E16',
+                borderColor: '#EF9700',
+                borderWidth: 1,
+              },
+              lineStyle: {
+                normal: {
+                  color: "#EF9700",
+                  width: 2
                 }
-                if (this.data.typeCondition === 3) {
+              },
-                    params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 5));
+              data: [datavaule2]
+            }]
+            var option = {
+              tooltip: {
+                show: true,
+                trigger: "item",
+                textStyle: {
+                  color: '#000',
+                  fontSize: 14
+                },
+                formatter(params) {
+                  // console.log(params)
+                  if (params.name === '') {
+                    return '';
+                  }
+                  return `${params.name} : ${params.percent}%`;
+                },
+              },
+              legend: {
+                show: true,
+                textStyle: {
+                  color: '#999999',
+                  rich: {
+                    name: {
+                      fontSize: 14,
+                      lineHeight: 19,
+                      padding: [20, 0, 0, 0]
+                    },
+                  }
+                },
+                itemWidth: 6,
+                itemHeight: 6,
+                y: 'bottom',
+                x: 'center',
+                formatter: name => {
+                  return `{name|${name}}`
+                },
+                data: legendName,
+              },
+              radar: {
+                center: ["50%", "40%"],
+                radius: "50%",
+                startAngle: 90,
+                splitNumber: 5,
+                splitArea: {
+                  areaStyle: {
+                    color: 'transparent'
+                  }
+                },
+                name: {
+                  textStyle: {
+                    color: '#333333',
+                    fontSize: 14,
+                    borderRadius: 3,
+                  }
+                },
+                indicator: indicator
+              },
+              axisLabel: {
+                show: true,
+              },
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "rgba(226,226,226,0.28)"
                 }
-                if (this.data.typeCondition === 4) {
+              },
-                    params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 11));
+              splitLine: {
+                show: true,
+                lineStyle: {
+                  color: "rgba(226,226,226,0.61)"
                 }
-
+              },
-                if (this.data.typeCondition === 1) {
+              series
-                    params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59))
+            };
-                } else {
+            chart.setOption(option, true);
-                    params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59))
+          })
+        } else {
+          event12345Group().then(({ data }) => {
+            var dataname = data.map(item => item.name)
+            var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
+            var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
+            var indicator = []
+            let max = Math.max(...datavaule, ...datavaule2)
+            console.log(max)
+            var datamax = new Array(datavaule.length).fill(max)
+            for (var i = 0; i < dataname.length; i++) {
+              indicator.push({
+                name: datavaule[i] + '\n' + dataname[i],
+                max: datamax[i],
+              })
+            }
+            let legendName = ['12345热线事件\n上报人数']
+            let series = [{
+              name: "12345热线事件\n上报人数",
+              type: "radar",
+              symbol: "circle",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  color: 'rgba(58,128,231,0.36)',
                 }
-                console.log(params)
+              },
-                console.log(this.data.tabValue,'this.data.tabValue')
+              itemStyle: {
-                if (this.data.tabValue === 1) {
+                color: '#3A80E7',
-                    satisfactionGroup(params).then(({data}) => {
+                borderColor: '#3AB7FF',
-                        var dataname = data.map(item => item.name)
+                borderWidth: 1,
-                        var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
+              },
-                        var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
+              lineStyle: {
-                        var indicator = []
+                normal: {
-                        let max = Math.max(...datavaule, ...datavaule2)
+                  color: "#3AB7FF",
-                        console.log(max)
+                  width: 2
-                        var datamax = new Array(datavaule.length).fill(max)
-                        for (var i = 0; i < dataname.length; i++) {
-                            indicator.push({
-                                name: dataname[i],
-                                max: datamax[i],
-                            })
-                        }
-                        let legendName = ['省满意度调查各项\n不满意人数', '社区满意度自查各项\n不满意人数']
-                        let series = [{
-                            name: "省满意度调查各项\n不满意人数",
-                            type: "radar",
-                            symbol: "circle",
-                            symbolSize: 0,
-                            areaStyle: {
-                                normal: {
-                                    color: 'rgba(58,128,231,0.36)',
-                                }
-                            },
-                            itemStyle: {
-                                color: '#3A80E7',
-                                borderColor: '#3AB7FF',
-                                borderWidth: 1,
-                            },
-                            lineStyle: {
-                                normal: {
-                                    color: "#3AB7FF",
-                                    width: 2
-                                }
-                            },
-                            data: [datavaule]
-                        }, {
-                            name: "社区满意度自查各项\n不满意人数",
-                            type: "radar",
-                            symbol: "circle",
-                            symbolSize: 0,
-                            areaStyle: {
-                                normal: {
-                                    color: 'rgba(170, 216, 255, 0)',
-                                }
-                            },
-                            itemStyle: {
-                                color: '#EB8E16',
-                                borderColor: '#EF9700',
-                                borderWidth: 1,
-                            },
-                            lineStyle: {
-                                normal: {
-                                    color: "#EF9700",
-                                    width: 2
-                                }
-                            },
-                            data: [datavaule2]
-                        }]
-                        var option = {
-                            tooltip: {
-                                show: true,
-                                trigger: "item",
-                                textStyle: {
-                                    color: '#000',
-                                    fontSize: 14
-                                },
-                                formatter(params) {
-                                    // console.log(params)
-                                    if (params.name === '') {
-                                        return '';
-                                    }
-                                    return `${params.name} : ${params.percent}%`;
-                                },
-                            },
-                            legend: {
-                                show: true,
-                                textStyle: {
-                                    color: '#999999',
-                                    rich: {
-                                        name: {
-                                            fontSize: 14,
-                                            lineHeight: 19,
-                                            padding: [20, 0, 0, 0]
-                                        },
-                                    }
-                                },
-                                itemWidth: 6,
-                                itemHeight: 6,
-                                y: 'bottom',
-                                x: 'center',
-                                formatter: name => {
-                                    return `{name|${name}}`
-                                },
-                                data: legendName,
-                            },
-                            radar: {
-                                center: ["50%", "40%"],
-                                radius: "50%",
-                                startAngle: 90,
-                                splitNumber: 5,
-                                splitArea: {
-                                    areaStyle: {
-                                        color: 'transparent'
-                                    }
-                                },
-                                axisLabel: {
-                                    show: false,
-                                },
-                                axisLine: {
-                                    show: true,
-                                    lineStyle: {
-                                        color: "rgba(226,226,226,0.28)"
-                                    }
-                                },
-                                splitLine: {
-                                    show: true,
-                                    lineStyle: {
-                                        color: "rgba(226,226,226,0.61)"
-                                    }
-                                },
-                                name: {
-                                    textStyle: {
-                                        color: '#333333',
-                                        fontSize: 14,
-                                        borderRadius: 3,
-                                    }
-                                },
-                                indicator: indicator
-                            },
-                            series
-                        };
-                        chart.setOption(option, true);
-                    })
-                } else {
-                    event12345Group().then(({data}) => {
-                        var dataname = data.map(item => item.name)
-                        var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
-                        var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
-                        var indicator = []
-                        let max = Math.max(...datavaule, ...datavaule2)
-                        console.log(max)
-                        var datamax = new Array(datavaule.length).fill(max)
-                        for (var i = 0; i < dataname.length; i++) {
-                            indicator.push({
-                                name: dataname[i],
-                                max: datamax[i],
-                            })
-                        }
-                        let legendName = ['12345热线事件\n上报人数']
-                        let series = [{
-                            name: "12345热线事件\n上报人数",
-                            type: "radar",
-                            symbol: "circle",
-                            symbolSize: 0,
-                            areaStyle: {
-                                normal: {
-                                    color: 'rgba(58,128,231,0.36)',
-                                }
-                            },
-                            itemStyle: {
-                                color: '#3A80E7',
-                                borderColor: '#3AB7FF',
-                                borderWidth: 1,
-                            },
-                            lineStyle: {
-                                normal: {
-                                    color: "#3AB7FF",
-                                    width: 2
-                                }
-                            },
-                            data: [datavaule]
-                        },]
-                        var option = {
-                            tooltip: {
-                                show: true,
-                                textStyle: {
-                                    color: '#fff',
-                                    fontSize: 14
-                                },
-                                formatter(params) {
-                                    // console.log(params)
-                                    if (params.name === '') {
-                                        return '';
-                                    }
-                                    return `${params.name} : ${params.percent}%`;
-                                },
-                            },
-                            legend: {
-                                show: true,
-                                textStyle: {
-                                    color: '#999999',
-                                    rich: {
-                                        name: {
-                                            fontSize: 14,
-                                            lineHeight: 19,
-                                            padding: [20, 0, 0, 0]
-                                        },
-                                    }
-                                },
-                                itemWidth: 6,
-                                itemHeight: 6,
-                                y: 'bottom',
-                                x: 'center',
-                                formatter: name => {
-                                    return `{name|${name}}`
-                                },
-                                data: legendName,
-                            },
-                            radar: {
-                                center: ["50%", "40%"],
-                                radius: "50%",
-                                startAngle: 90,
-                                splitNumber: 5,
-                                splitArea: {
-                                    areaStyle: {
-                                        color: 'transparent'
-                                    }
-                                },
-                                axisLabel: {
-                                    show: false,
-                                },
-                                axisLine: {
-                                    show: true,
-                                    lineStyle: {
-                                        color: "rgba(226,226,226,0.28)"
-                                    }
-                                },
-                                splitLine: {
-                                    show: true,
-                                    lineStyle: {
-                                        color: "rgba(226,226,226,0.61)"
-                                    }
-                                },
-                                name: {
-                                    textStyle: {
-                                        color: '#333333',
-                                        fontSize: 14,
-                                        borderRadius: 3,
-                                    }
-                                },
-                                indicator: indicator
-                            },
-                            series
-                        };
-                        chart.setOption(option, true);
-                    })
                 }
-                return chart;
+              },
-            })
+              data: [datavaule]
+            },]
+            var option = {
+              tooltip: {
+                show: true,
+                textStyle: {
+                  color: '#fff',
+                  fontSize: 14
+                },
+                formatter(params) {
+                  // console.log(params)
+                  if (params.name === '') {
+                    return '';
+                  }
+                  return `${params.name} : ${params.percent}%`;
+                },
+              },
+              legend: {
+                show: true,
+                textStyle: {
+                  color: '#999999',
+                  rich: {
+                    name: {
+                      fontSize: 14,
+                      lineHeight: 19,
+                      padding: [20, 0, 0, 0]
+                    },
+                  }
+                },
+                itemWidth: 6,
+                itemHeight: 6,
+                y: 'bottom',
+                x: 'center',
+                formatter: name => {
+                  return `{name|${name}}`
+                },
+                data: legendName,
+              },
+              radar: {
+                center: ["50%", "40%"],
+                radius: "50%",
+                startAngle: 90,
+                splitNumber: 5,
+                splitArea: {
+                  areaStyle: {
+                    color: 'transparent'
+                  }
+                },
+                axisLabel: {
+                  show: false,
+                },
+                axisLine: {
+                  show: true,
+                  lineStyle: {
+                    color: "rgba(226,226,226,0.28)"
+                  }
+                },
+                splitLine: {
+                  show: true,
+                  lineStyle: {
+                    color: "rgba(226,226,226,0.61)"
+                  }
+                },
+                name: {
+                  textStyle: {
+                    color: '#333333',
+                    fontSize: 14,
+                    borderRadius: 3,
+                  }
+                },
+                indicator: indicator
+              },
+              series
+            };
+            chart.setOption(option, true);
+          })
         }
+        return chart;
+      })
     }
+  }
 });

subpages/OCRCard/pages/index/index.wxss

@@ -55,7 +55,7 @@ page {
 
 .body{
     position: relative;
-    top: -400rpx;
+    top: -200rpx;
     display: flex;
     flex-direction: column;
     justify-content: center;

subpages/addhouse/pages/addhouse/addhouse.wxss

@@ -124,7 +124,8 @@ page {
 .form_card .form_textarea .input{
     background-color: #f7f7f7;
     border-radius: 20rpx;
-    padding:27rpx ;
+    padding:27rpx;
+    width: calc(100% - 54rpx);
 }
 .form_card .form_item .label,
 .form_card .form_textarea .label

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml

@@ -71,7 +71,7 @@
           </view>
           
           <view class="mkf-img" bindtap="showRecordSheet">
-            <image src="../../../images/mkf.png" mode=""/> 您也可以语音输入描述
+            <image src="../../../images/mkf.png" mode="widthFix" /> 您也可以语音输入描述
           </view>
         </view>
         <!-- 上传图片 -->
@@ -88,7 +88,7 @@
               wx:key="imageId">
               <image class="issue-image" src="{{item.imgUrl}}" />
               <image wx:if="{{!item.uploaded}}" class="loading" src="../../../images/loading.gif" />
-              <image bindtap="deleteImage" data-imageid="{{item.imageId}}" class="close" wx:else src="../../../images/icon_close.png" />
+              <image bindtap="deleteImage" data-imageid="{{item.imageId}}" class="close" wx:else src="../../../images/sc.png" />
             </view>
             <image wx:if="{{uploadImageList.length < 3}}" src="../../../images/ig_tianjiatupian@2x.png" bindtap="chooseImage" />
           </view>

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss

@@ -105,7 +105,7 @@ page {
   grid-template-columns: 214rpx 214rpx 214rpx;
   grid-template-rows: 214rpx;
   grid-gap: 17rpx;
-  height: 214rpx;
+  height: 188rpx;
   margin-top:80rpx ;
 }
 .image-list-2 {
@@ -123,8 +123,10 @@ page {
   position: relative;
 }
  .image-list image {
-  width: 100%;
+  /* width: 100%; */
-  height: 100%;
+  /* height: 100%; */
+  width: 180rpx;
+  height: 180rpx;
   object-fit: cover;
   border-radius: 8rpx;
 }
@@ -935,10 +937,12 @@ background: rgb(175, 1, 1);
     color: #999;
     font-size: 26rpx;
     font-family: PingFang SC;
+    margin-top: 34rpx;
   }
   .mkf-img image{
-    width: 91rpx;
+    width: 46rpx;
-    height: 80rpx;
+    height: 46rpx;
+    margin-right: 9rpx;
   }
   .audio-play{
     display: flex;

subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss

@@ -11,7 +11,8 @@
 .title {
     font-size: 30rpx;
     color: #333333;
-    margin-bottom: 60rpx;
+    padding-bottom: 30rpx;
+    border-bottom: 1px solid #EAEAEA
 }
 .bold {
     font-weight: bold;
@@ -26,6 +27,7 @@
 .log-item .user {
     display: flex;
     align-items: center;
+    margin-bottom: 10rpx
 }
 .log-item .icon {
     width: 48rpx;

subpages/statistics/pages/event/detail/detail.wxml

@@ -22,8 +22,8 @@
     </view>
 
     <view class="card">
-        <view class="title">处理进展</view>
+        <view class="title" style="margin-bottom: 0;">处理进展</view>
-        <wux-steps wx:if="{{process.length > 0}}" direction="vertical" :current="0">
+        <wux-steps wx:if="{{process.length > 0}}" style="margin-top: 39rpx" direction="vertical" :current="0">
             <wux-step wx:for="{{process}}" wx:key="index" icon="none">
                 <view slot="title">
                     <view class="step-title" wx:if="{{item.agencyId}}">【指派】</view>

subpages/statistics/pages/event/detail/detail.wxss

@@ -14,7 +14,7 @@ page {
     font-size: 32rpx;
     font-weight: bold;
     color: #333333;
-    margin-bottom: 30rpx;
+    margin-bottom: 10rpx;
     display: flex;
     align-items: center;
     justify-content: space-between;

subpages/statistics/pages/event/list/list.wxml

@@ -1,65 +1,52 @@
 <view class="screen">
-    <picker
+  <picker model:value="{{ orgIndex }}" range="{{orgList}}" range-key="label" data-key="orgIndex" bindchange="setVal">
-            model:value="{{ orgIndex }}"
+    <view class="picker-type {{orgIndex >= 0 ?'cur':''}}">
-            range="{{orgList}}"
+      <text>{{ orgIndex >= 0 ? orgList[orgIndex].label : '按组织' }}</text>
-            range-key="label"
+      <image src="../../../images/down.png" wx:if="orgIndex >= 0" mode="widthFix" />
-            data-key="orgIndex"
+      <image src="../../../images/down2.png" wx:else mode="widthFix" />
-            bindchange="setVal"
+    </view>
-    >
-        <view class="picker">
-            <text>{{ orgIndex >= 0 ? orgList[orgIndex].label : '按组织' }}</text>
-            <image src="../../../images/down.png" mode="widthFix"/>
-        </view>
 
-    </picker>
+  </picker>
-    <picker
+  <picker range="{{satisfactionSourceOptions}}" range-key="label" model:value="{{ satisfactionSourceIndex }}" bind:change="sourceChange">
-            range="{{satisfactionSourceOptions}}"
+    <view class="picker-type {{satisfactionSourceIndex > 0 ?'cur':''}}">
-            range-key="label"
+      <text>{{ satisfactionSourceIndex > 0 ? satisfactionSourceOptions[satisfactionSourceIndex].label : '按来源' }}</text>
-            model:value="{{ satisfactionSourceIndex }}"
+      <image src="../../../images/down.png" wx:if="{{satisfactionSourceIndex > 0}}" mode="widthFix" />
-            bind:change="sourceChange"
+      <image src="../../../images/down2.png" wx:else mode="widthFix" />
-    >
+    </view>
-        <view class="picker-type">
+
-            <text>{{ satisfactionSourceIndex >= 0 ? satisfactionSourceOptions[satisfactionSourceIndex].label : '按来源'
+  </picker>
-                }}</text>
+  <picker range="{{tagOptions}}" range-key="label" model:value="{{ tagIndex }}">
-            <image src="../../../images/down2.png" mode="widthFix"/>
+    <view class="picker-type {{tagIndex > 0 ?'cur':''}}">
-        </view>
+      <text>{{ tagIndex > 0 ? tagOptions[tagIndex].label : '按标记' }}</text>
-    </picker>
+      <image src="../../../images/down.png" wx:if="{{tagIndex > 0}}" mode="widthFix" />
-    <picker
+      <image src="../../../images/down2.png" wx:else mode="widthFix" />
-            range="{{tagOptions}}"
-            range-key="label"
-            model:value="{{ tagIndex }}"
-    >
-        <view class="picker-type">
-            <text>{{ tagIndex >= 0 ? tagOptions[tagIndex].label : '按标记'
-                }}</text>
-            <image src="../../../images/down2.png" mode="widthFix"/>
-        </view>
-    </picker>
-    <view class="btn" bindtap="onConfirm">
-        筛选
     </view>
+
+  </picker>
+  <view class="btn" bindtap="onConfirm">
+    筛选
+  </view>
 </view>
 <scroll-view bind:scrolltolower="scrolltolower" scroll-y style="height: calc(100vh - 92rpx)" class="statistics-container">
-    <view class="card-list" wx:for="{{list}}" wx:key="{{index}}">
+  <view class="card-list" wx:for="{{list}}" wx:key="{{index}}">
-        <view class="content">
+    <view class="content">
-            <view class="item" bind:tap="gotopage" data-id="{{item.icEventId}}">
+      <view class="item" bind:tap="gotopage" data-id="{{item.icEventId}}">
-                <view class="user-info">
+        <view class="user-info">
-                    <view class="name">
+          <view class="name">
-                        {{item.name ? item.name : ''}} {{item.mobile ? item.mobile : ''}}
+            {{item.name ? item.name : ''}} {{item.mobile ? item.mobile : ''}}
-                    </view>
+          </view>
-                    <view class="tag blue">
+          <view class="tag blue">
-                        {{item.sourceTypeName}}
+            {{item.sourceTypeName}}
-                    </view>
+          </view>
-                </view>
+        </view>
-                <view class="date">
+        <view class="date">
-                    <view class="type">{{item.gridName ? item.gridName : ''}}</view>
+          <view class="type">{{item.gridName ? item.gridName : ''}}</view>
-                    <view class="time">{{item.happenTime ? item.happenTime : ''}}</view>
+          <view class="time">{{item.happenTime ? item.happenTime : ''}}</view>
-                </view>
-                <view class="describe">
-                    {{item.eventContent ? item.eventContent : ''}}
-                </view>
-            </view>
         </view>
+        <view class="describe">
+          {{item.eventContent ? item.eventContent : ''}}
+        </view>
+      </view>
     </view>
-</scroll-view>
+  </view>
-
+</scroll-view>

subpages/statistics/pages/event/list/list.wxss

@@ -59,7 +59,11 @@ page {
     text-align: center;
 
 }
-
+.picker-type.cur {
+  background: rgba(58, 128, 231, 0.16);
+  border: 1px solid #3A80E7;
+  color: #3A80E7;
+}
 .btn {
     width: 120rpx;
     height: 56rpx;

subpages/statistics/pages/problem/problem.wxss

@@ -66,7 +66,9 @@ page {
     font-weight: bold;
     color: #FF783C;
 }
-
+.event-list .event-item:first-child {
+  padding-top: 0;
+}
 .event-list .event-item {
     border-bottom: 1px solid #EAEAEA;
     padding: 30rpx 0;
@@ -76,7 +78,7 @@ page {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 25rpx;
+    margin-bottom: 15rpx;
 }
 .event-list .event-item .userInfo .name {
     font-size: 34rpx;
@@ -92,7 +94,7 @@ page {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 30rpx;
+    margin-bottom: 20rpx;
 }
 .event-list .event-item .address .grid {
     font-size: 28rpx;