修改冲突

pages/handlecase/component/list.vue

 	export default {
 		data() {
 			return {
-
+				
 			}
 		},
 		props: {

pages/handlecase/component/newlyAddedCase.vue

 				@tap="cencalBut">取消</button>
 			</view>
 		</view>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
 	import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById} from '../../../api/handlecase/index.js'
 	import {
 			this.$refs.form.setRules(this.rules)
 		}
 	}
-	
-</script>
-
+	
+</script>
+
 <style lang="scss">
 	page {
 		background-color: #ffffff;
 	}
 	.assignrbitrators{
 		margin: 30rpx;
-	}
+	}
 </style>