Merge branch '任务优化' into release/9.30.0

components/Yl_field/index.wxml

@@ -181,7 +181,7 @@
       </view>
     </view>
     <!-- 输入框 -->
-    <van-field wx:else label="{{item.label}}" required="{{item.required}}" value="{{ item.value }}" placeholder="{{item.placeholder||'请填写'}}" label-class='label-class' type="{{item.type}}" error="{{item.error}}" error-message='{{item.errMsg}}' disabled="{{item.disabled}}" autosize border="{{ false }}" bind:input="inputChange" bind:blur='onBlur' data-item="{{item}}">
+    <van-field wx:else label="{{item.label}}" required="{{item.required}}" maxlength="{{item.maxlength||'-1'}}" value="{{ item.value }}" placeholder="{{item.placeholder||'请填写'}}" label-class='label-class' type="{{item.type}}" error="{{item.error}}" error-message='{{item.errMsg}}' disabled="{{item.disabled}}" autosize border="{{ false }}" bind:input="inputChange" bind:blur='onBlur' data-item="{{item}}">
       <view slot='button' style="display: flex;">
         <view wx:if="{{item.slot}}" style="margin-right: 8rpx;">
           <slot name="{{item.slot}}" />

packageA/work/add.js

@@ -12,10 +12,11 @@ Page({
             errMsg: "",
             type: "textarea",
             value: "",
-            placeholder: "",
+            placeholder: "请输入0/40字",
             valueName: "title",
             checking: "base",
-            required: true
+            required: true,
+            maxlength: '40'
         }, {
             label: "任务要求",
             error: false,

packageA/work/detail.js

@@ -28,7 +28,6 @@ Page({
         })
     },
     onConfirm(e) {
-        console.log(this.data.finishnotes)
         _Http.basic({
             "id": 20221211112501,
             "content": {
@@ -192,7 +191,7 @@ Page({
                         label: "开始时间",
                         value: res.data.starttime
                     }, {
-                        label: "截止时间",
+                        label: "结束时间",
                         value: res.data.endtime
                     },
                     {
@@ -211,7 +210,7 @@ Page({
                     label: "开始时间",
                     value: res.data.starttime
                 }, {
-                    label: "截止时间",
+                    label: "结束时间",
                     value: res.data.endtime
                 }, {
                     label: '关联应用数据',

packageA/work/modules/list/index.js

@@ -1,11 +1,5 @@
 Component({
     properties: {
         list: {type:Array}
-    },
-    data: {
-
-    },
-    methods: {
-
     }
 })

packageA/work/modules/list/index.wxml

@@ -6,10 +6,10 @@
     </view>
     <view class="tag-box">
         <van-tag custom-class='tag' wx:for="{{item.tags.systemtag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{tag}}</van-tag>
-        <van-tag custom-class='tag' wx:for="{{item.tags.datatag}}"  wx:key="index" wx:for-item='tag' color='#FAAB16' text-color='#fff' round>{{tag}}</van-tag>
+        <van-tag custom-class='tag' wx:for="{{item.tags.datatag}}" wx:key="index" wx:for-item='tag' color='#FAAB16' text-color='#fff' round>{{tag}}</van-tag>
     </view>
     <view class="exp line-1">开始时间：<text>{{item.starttime}}</text></view>
-    <view class="exp line-1">截止时间：<text>{{item.endtime}}</text></view>
+    <view class="exp line-1">结束时间：<text>{{item.endtime||' --'}}</text></view>
 </navigator>
 
 <wxs module="backColor">