diff --git a/pagesA/checkout/detail/detail.vue b/pagesA/checkout/detail/detail.vue
index 73c513a..b547c0b 100644
--- a/pagesA/checkout/detail/detail.vue
+++ b/pagesA/checkout/detail/detail.vue
@@ -92,27 +92,11 @@
     <view class="section-card">
       <view class="section-title">图片/视频</view>
       <u-upload
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-        accept="media"
-=======
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
         :max-count="10"
         :multiple="true"
         :preview-full-image="true"
         :deletable="true"
         :show-upload-list="true"
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
         :fileList="fileList"
         :auto-upload="false"
         accept="all"
@@ -208,9 +192,6 @@ export default {
     onDeviceChange(idx, val) {
       this.deviceList[idx].status = val;
     },
-    beforeRead(event) {
-      console.log("event", event);
-    },
     chooseImage() {
       uni.chooseImage({
         count: 10 - this.fileList.length,
@@ -249,7 +230,7 @@ export default {
       return false;
     },
     // 删除文件
-  onDelete(event) {
+    onDelete(event) {
       this[`fileList${event.name}`].splice(event.index, 1);
       var arry = [];
       this.fileList.filter((v, i) => {