Merge remote-tracking branch 'origin/master'

jiangping

2024-06-12 78dd96d3db3ff54deda77611b5dfea33e40914a3

 h5/pages/staff/task/index.vue

@@ -118,6 +118,10 @@
          </view>
        </view>
      </view>
      <view v-if="dataList.length === 0"  style="text-align: center;">
        <image src="@/static/empty.png" style="width: 320rpx;margin: 120px auto 0" mode="widthFix" />
        <view class="placeholder9 fs24">暂无数据</view>
      </view>
    </view>
    <!-- 筛选 -->
    <u-popup
@@ -279,7 +283,9 @@
      }).then(res => {
        this.dataList = [...this.dataList, ...res.data.records]
        this.dataList.forEach(i => {
          i.param1 = JSON.parse(i.param1)
          if(i.param1){
            i.param1 = JSON.parse(i.param1)
          }
        })
        console.log('dataList', this.dataList)
      })