Merge remote-tracking branch 'origin/master'

jiangping

2024-10-14 8aff182ef3a075540119a98a9ae03d80dd97318e

 h5/pages/staff/task/visitorReport.vue

@@ -222,143 +222,166 @@
  padding-bottom: 0;

  .flow_wrap {
    padding: 30rpx 0;

    .flow_title {
      font-weight: 600;
      font-size: 32rpx;
      color: #222222;
      margin-bottom: 24rpx;
    }

    .list {
      .item {
        display: flex;
        margin-bottom: 48rpx;
        position: relative;

        .separate {
          position: absolute;
          width: 4rpx;
          height: 100%;
          background-color: #eeeeee;
          left: 40rpx;
          transform: translate(-50%, 0);
          top: 80rpx;
        }

        .avatar {
          width: 80rpx;
          height: 80rpx;
          position: relative;
          margin-right: 20rpx;

          .img {
            width: 80rpx;
            height: 80rpx;
            border-radius: 50%;
          }

          .status {
            width: 28rpx;
            height: 28rpx;
            border-radius: 50%;
            position: absolute;
            right: 0;
            bottom: 0;
          }
        }

        .content {
          flex: 1;

          .head {
            display: flex;
            justify-content: space-between;
            margin-bottom: 4rpx;

            .event {
              font-size: 30rpx;
            }

            .time {
              font-size: 26rpx;
              color: #999999;
            }
          }

          .name_wrap {
            font-size: 26rpx;
            color: #777777;

            .status {
              color: $uni-color-primary;
            }
          }

          .children {
            display: flex;
            flex-wrap: wrap;
            margin-top: 12rpx;

            .child {
              display: flex;
              flex-direction: column;
              justify-content: center;
              align-items: center;
              margin-right: 12rpx;
                     font-size: 26rpx;
                     color: #777777;
              .child_img {
                width: 48rpx;
                height: 48rpx;
                border-radius: 50%;
              }
            }
          }

          .remark {
            margin-top: 12rpx;
            background-color: #f7f7f7;
            padding: 14rpx 20rpx;
            border-radius: 8rpx;
            font-size: 26rpx;
            color: #666666;
            line-height: 36rpx;
          }
        }

        .carbon {
          display: flex;
          width: 590rpx;
          overflow-x: auto;
          margin-top: 12rpx;

          .carbon_item {
            text-align: center;
            flex-shrink: 0;
            width: 100rpx;

            image {
              width: 60rpx;
              height: 60rpx;
              margin: 0 auto;
            }

            view {
              font-size: 26rpx;
              color: #777777;
            }
          }
        }

        &:nth-last-child(1) {
          .separate {
            height: 0;
          }
        }
      }
    }
     padding: 30rpx 0;
  
     .flow_title {
        font-weight: 600;
        font-size: 32rpx;
        color: #222222;
        margin-bottom: 24rpx;
     }
  
     .list {
        .item {
           display: flex;
           margin-bottom: 48rpx;
           position: relative;
  
           .separate {
              position: absolute;
              width: 4rpx;
              height: 100%;
              background-color: #eeeeee;
              left: 40rpx;
              transform: translate(-50%, 0);
              top: 80rpx;
           }
  
           .avatar {
              width: 80rpx;
              height: 80rpx;
              position: relative;
              margin-right: 20rpx;
              display: flex;
              align-items: center;
              justify-content: center;
  
              .img {
                 width: 80rpx;
                 height: 80rpx;
                 border-radius: 50%;
              }
  
              .img_name {
                 font-size: 32rpx;
                 color: #FFFFFF;
              }
  
              .status {
                 width: 28rpx;
                 height: 28rpx;
                 border-radius: 50%;
                 position: absolute;
                 right: 0;
                 bottom: 0;
              }
           }
  
           .content {
              flex: 1;
  
              .head {
                 display: flex;
                 justify-content: space-between;
                 margin-bottom: 4rpx;
  
                 .event {
                    font-size: 30rpx;
                 }
  
                 .time {
                    font-size: 26rpx;
                    color: #999999;
                 }
              }
  
              .name_wrap {
                 font-size: 26rpx;
                 color: #777777;
  
                 .status {
                    color: $uni-color-primary;
                 }
              }
  
              .children {
                 display: flex;
                 flex-wrap: wrap;
                 margin-top: 12rpx;
  
                 .child {
                    display: flex;
                    flex-direction: column;
                    justify-content: center;
                    align-items: center;
                    margin-right: 12rpx;
                    font-size: 26rpx;
                    color: #777777;
  
                    .child_img {
                       width: 48rpx;
                       height: 48rpx;
                       border-radius: 50%;
                       margin-bottom: 2rpx;
                    }
  
                    .child_name {
                       margin-bottom: 2rpx;
                       width: 48rpx;
                       height: 48rpx;
                       text-align: center;
                       justify-content: center;
                       padding-top: 4rpx;
                       font-size: 28rpx;
                       border-radius: 50%;
                       color: #FFFFFF;
                       background-color: $uni-color-primary;
                    }
                 }
              }
  
              .remark {
                 margin-top: 12rpx;
                 background-color: #f7f7f7;
                 padding: 14rpx 20rpx;
                 border-radius: 8rpx;
                 font-size: 26rpx;
                 color: #666666;
                 line-height: 36rpx;
              }
           }
  
           .carbon {
              display: flex;
              width: 590rpx;
              overflow-x: auto;
              margin-top: 12rpx;
  
              .carbon_item {
                 text-align: center;
                 flex-shrink: 0;
                 width: 100rpx;
  
                 image {
                    width: 60rpx;
                    height: 60rpx;
                    margin: 0 auto;
                 }
  
                 view {
                    font-size: 26rpx;
                    color: #777777;
                 }
              }
           }
  
           &:nth-last-child(1) {
              .separate {
                 height: 0;
              }
           }
        }
     }
  }

  .module_list {