Merge branch '绿色' into 测试

pages/trace/index.scss

@@ -46,10 +46,22 @@
     margin-bottom: 20rpx;
 
     .item {
+        position: relative;
         width: 100vw;
         padding: 20rpx 30rpx;
         box-sizing: border-box;
 
+        .resource {
+            position: absolute;
+            padding: 4rpx 14rpx;
+            background-color: #3874F6;
+            color: #fff;
+            font-size: 24rpx;
+            top: 20rpx;
+            right: 20rpx;
+            border-radius: 2rpx;
+        }
+
         .user {
             display: flex;
 

pages/trace/index.wxml

@@ -16,6 +16,7 @@
 
 <view class="trace-box" wx:for="{{list}}" wx:key="sys_datafollowupid">
     <navigator url="#" class="item" data-item="{{item}}" bindtap="toDetail">
+        <view wx:if="{{item.resource}}" class="resource"> {{language[item.resource]||item.resource}}</view>
         <view class="createdate">
             {{item.createdate}}
         </view>