fix: add space in my continuing tickets; dutyinfo data process

src/pages/repair/repair.tsx

@@ -194,8 +194,8 @@ export default class RepairPage extends Component<{}, RepairPageState> {
           {pt.get().repairPage.currentTicket.hint}
         </View>
         {this.state.currentTicketsIdName.map((pair, idx) => (
+          <View key={idx} style={{ marginBottom: '20rpx' }}>
             <AtCard
-            key={idx}
               title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
               extra={pt.get().repairPage.currentTicket.extra}
               onClick={() => {
@@ -217,6 +217,7 @@ export default class RepairPage extends Component<{}, RepairPageState> {
                 middleButton={middleButton}
               />
             </AtCard>
+          </View>
         ))}
       </View>
     ) : (

src/service/dutyInfo.ts

@@ -28,14 +28,14 @@ export function getDutyInfo(that: MainPage) {
       if (!data.isInDuty) {
         that.setState({
           dutyData: {
-            ...that.state.dutyData,
+            ...data,
             offDutyReason: pt.get().common.offDutyReason,
           },
         });
         if (data.currentDuty === '0') {
           that.setState({
             dutyData: {
-              ...that.state.dutyData,
+              ...data,
               place: pt.get().common.place,
               offDutyReason: pt.get().common.offDutyReason,
               dutyRecoverTime: pt.get().common.dutyRecoverTime,
@@ -45,7 +45,7 @@ export function getDutyInfo(that: MainPage) {
       } else {
         that.setState({
           dutyData: {
-            ...that.state.dutyData,
+            ...data,
             place: pt.get().common.place,
           },
         });