Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/tbServantMini_cloud into master

client/pages/servant/taskreminder/taskreminder.acss

@@ -11,6 +11,12 @@
   color: #333333;
   font-size: 32rpx;
 }
+.item-task-wrapper{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start
+}
 .cell-title image{
   width: 24rpx;
   height: 16rpx;
@@ -97,7 +103,7 @@
 .tasks-list-item{
   height: 100rpx;
   background: #FAFAFA;
-  border-radius: 12px;
+  border-radius: 12rpx;
   font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
@@ -105,17 +111,21 @@
   line-height: 100rpx;
   padding-left: 28rpx;
   margin-top: 30rpx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
 }
 .tasks-item-no{
   width: 122rpx;
   height: 102rpx;
-  float: right;
+  /* float: right; */
   background-color:#fff6f4;
 }
 .tasks-item-yes{
   width: 122rpx;
   height: 102rpx;
-  float: right;
+  /* float: right; */
   border-top-right-radius: 12rpx;
   border-bottom-right-radius: 12rpx;
   background-color:#f2fbff;

client/pages/servant/taskreminder/taskreminder.axml

@@ -45,27 +45,32 @@
       <view a:if="{{isreminds}}" a:for="{{taskList}}" key="{{index}}">
         <view class="tasks-list-item" a:if="{{item.state == 0}}">
           <text> {{item.itemName}}</text>
+          <view class="item-task-wrapper">
           <view class="tasks-item-yes" onTap="showyes" data-id="{{item.id}}">
             <image mode="scaleToFill" src="/image/icon-yes.png"/>
           </view>
           <view class="tasks-item-no" onTap="showcancel" data-id="{{item.id}}">
             <image mode="scaleToFill" src="/image/icon-no.png"/>
           </view>
+          </view>
         </view>
         <view class="tasks-list-item" a:if="{{item.state == 1}}">
           <text> {{item.itemName}}</text>
+          
           <view class="tasks-item-yes">
             <image mode="scaleToFill" src="/image/icon-yes.png"/>
           </view>
         </view>
         <view class="tasks-list-item" a:if="{{item.state == 2}}">
           <text>{{item.itemName}}</text>
+          <view class="item-task-wrapper">
           <label class="nogood" a:if="{{item.incompleteReason == 1}}">任务太多</label>
           <label class="nogood" a:if="{{item.incompleteReason == 2}}">我不会</label>
           <label class="nogood" a:if="{{item.incompleteReason == 3}}">任务不详细</label>
           <view class="tasks-item-yes">
             <image mode="scaleToFill" src="/image/icon-no.png"/>
           </view>
+          </view>
         </view>
       </view>
     </view>