Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/investigation/task.vue

@@ -342,11 +342,11 @@
 			</view>
 			<view class="blank" />
 		</view>
-		<bottom-button-two v-if="active === 1" @cancel="isEdit = !isEdit" :cancelText="'更改'" @confirm="
+		<bottom-button-two v-if="active === 1" @cancel="isEdit = !isEdit" :cancelText="isEdit?'取消':'更改'" @confirm="
         isEdit = false;
         active = 2;
       " />
-		<bottom-button v-else-if="active === 2" :secondText="'更改'" @second="isEditStep2 = !isEditStep2"
+		<bottom-button v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'" @second="isEditStep2 = !isEditStep2"
 			@first="active = 1" @last="active = 3" />
 		<bottom-button v-else-if="active === 3" :secondText="'暂存'" @first="active = 2" @second="submit(false)"
 			@last="submit(true)" />